diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/StackFramePopup.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/StackFramePopup.java
index 231b6376ba69..fc1326c0407a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/StackFramePopup.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/StackFramePopup.java
@@ -19,7 +19,7 @@ public final class StackFramePopup {
         .setTitle(JavaDebuggerBundle.message("select.stack.frame"))
         .setAutoSelectIfEmpty(true)
         .setResizable(false)
-        .setItemChoosenCallback(() -> list.navigateToSelectedValue(true))
+        .setItemChosenCallback(() -> list.navigateToSelectedValue(true))
         .createPopup();
 
       list.setSelectedIndex(1);
diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java
index a81fc34e4222..f8fc53421b3e 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java
@@ -360,7 +360,7 @@ public class ShowAffectedTestsAction extends AnAction {
         .setResizable(true)
         .setCommandButton(new CompositeActiveComponent(pinButton))
         .setSettingButton(new CompositeActiveComponent(runButton).getComponent())
-        .setItemChoosenCallback(() -> PsiNavigateUtil.navigate(tree.getSelectedElement()))
+        .setItemChosenCallback(() -> PsiNavigateUtil.navigate(tree.getSelectedElement()))
         .registerKeyboardAction(findUsageKeyStroke, __ -> pinActionListener.run())
         .setMinSize(new JBDimension(500, 300))
         .setDimensionServiceKey(ShowAffectedTestsAction.class.getSimpleName());
diff --git a/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java b/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
index a9ae3788d97a..fec37694076f 100644
--- a/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
+++ b/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
@@ -161,7 +161,7 @@ public abstract class FindJarFix extends ExpensivePsiIntentionAction implements
             JBPopupFactory.getInstance()
             .createListPopupBuilder(libNames)
             .setTitle(JavaBundle.message("popup.title.select.a.jar.file"))
-            .setItemChoosenCallback(() -> {
+            .setItemChosenCallback(() -> {
               String jarName = libNames.getSelectedValue();
               String url = libs.get(jarName);
               if (url != null) {
diff --git a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt b/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt
index 5e4291c53d26..58703a6b86c0 100644
--- a/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt
+++ b/json/src/com/intellij/jsonpath/ui/JsonPathEvaluateView.kt
@@ -384,7 +384,7 @@ internal abstract class JsonPathEvaluateView(protected val project: Project) : S
         .setMovable(false)
         .setResizable(false)
         .setRequestFocus(true)
-        .setItemChoosenCallback(Runnable {
+        .setItemChosenCallback(Runnable {
           val selectedValue = list.selectedValue
           if (selectedValue != null) {
             textField.text = selectedValue
diff --git a/platform/execution-impl/src/com/intellij/execution/actions/StopBackgroundProcessesAction.java b/platform/execution-impl/src/com/intellij/execution/actions/StopBackgroundProcessesAction.java
index ff34447ca593..04ecfb47ba7b 100644
--- a/platform/execution-impl/src/com/intellij/execution/actions/StopBackgroundProcessesAction.java
+++ b/platform/execution-impl/src/com/intellij/execution/actions/StopBackgroundProcessesAction.java
@@ -78,7 +78,7 @@ final class StopBackgroundProcessesAction extends DumbAwareAction {
       .setTitle(handlerItems.size() == 1 ? ExecutionBundle.message("confirm.background.process.stop")
                                          : ExecutionBundle.message("stop.background.process"))
       .setNamerForFiltering(o -> o.displayName)
-      .setItemChoosenCallback(() -> {
+      .setItemChosenCallback(() -> {
         List valuesList = list.getSelectedValuesList();
         for (Object o : valuesList) {
           if (o instanceof StopAction.HandlerItem) ((StopAction.HandlerItem)o).stop();
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java
index b7b7455f2444..f89db48cf482 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectPathField.java
@@ -46,8 +46,8 @@ import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 public class ExternalProjectPathField extends ComponentWithBrowseButton<ExternalProjectPathField.MyPathAndProjectButtonPanel>
   implements TextAccessor
@@ -110,7 +110,7 @@ public class ExternalProjectPathField extends ComponentWithBrowseButton<External
         JBPopup popup = new PopupChooserBuilder(tree)
           .setTitle(ExternalSystemBundle.message("run.configuration.title.choose.registered.project", externalSystemId.getReadableName()))
           .setResizable(true)
-          .setItemChoosenCallback(treeSelectionCallback)
+          .setItemChosenCallback(treeSelectionCallback)
           .setAutoselectOnMouseMove(true)
           .setCloseOnEnter(false)
           .createPopup();
diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
index b0c802d1cf8f..be2bc43b2e4f 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
@@ -981,7 +981,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction, HintManag
       });
     }
     else {
-      builder.setAutoselectOnMouseMove(true).setItemChoosenCallback(itemChoseCallback).setCloseOnEnter(true);
+      builder.setAutoselectOnMouseMove(true).setItemChosenCallback(itemChoseCallback).setCloseOnEnter(true);
     }
 
     AbstractPopup popup = (AbstractPopup)builder.createPopup();
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/Utils.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/Utils.java
index 918ef5828fb2..d8b67397c757 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/Utils.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/Utils.java
@@ -47,7 +47,7 @@ public final class Utils {
       .setMovable(false)
       .setResizable(false)
       .setRequestFocus(true)
-      .setItemChoosenCallback(callback)
+      .setItemChosenCallback(callback)
       .createPopup();
 
     if (ad != null) {
diff --git a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java
index 634f650c5e72..cf16d6261574 100644
--- a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java
+++ b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java
@@ -137,7 +137,7 @@ public class ImageDuplicateResultsDialog extends DialogWrapper {
         JBPopupFactory.getInstance().createListPopupBuilder(modules)
           .setTitle("Add Resource Module")
           .setNamerForFiltering(o -> o.getName())
-          .setItemChoosenCallback(() -> {
+          .setItemChosenCallback(() -> {
             Module value = modules.getSelectedValue();
             if (value != null && !myResourceModules.contains(value)) {
               myResourceModules.add(value);
diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
index ded0acc4d527..4282fb5e0ec4 100644
--- a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
@@ -227,7 +227,7 @@ public final class MasterDetailPopupBuilder implements MasterController {
       setUseDimensionServiceForXYLocation(myDimensionServiceKey != null).
       setSettingButton(toolBar).
       setSouthComponent(footerPanel).
-      setItemChoosenCallback(itemCallback).
+      setItemChosenCallback(itemCallback).
       setFilteringEnabled(o -> ((ItemWrapper)o).speedSearchText());
 
     if (myPopupTuner != null) {
diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
index c43545eec8fb..dc0220ac19b4 100644
--- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java
+++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
@@ -416,7 +416,7 @@ public class SearchTextField extends JPanel {
       myPopup = JBPopupFactory.getInstance().createListPopupBuilder(list)
         .setMovable(false)
         .setRequestFocus(true)
-        .setItemChoosenCallback(chooseRunnable)
+        .setItemChosenCallback(chooseRunnable)
         .setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         .createPopup();
       AlignedPopup.showUnderneathWithoutAlignment(myPopup, getPopupLocationComponent());
diff --git a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
index e86a366ea5d1..36f286937aec 100644
--- a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
+++ b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
@@ -164,7 +164,7 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
     final boolean surrendersFocusOnKeystrokeOldValue = myTable instanceof JBTable ? ((JBTable)myTable).surrendersFocusOnKeyStroke() : myTable.getSurrendersFocusOnKeystroke();
     final JBPopup popup = JBPopupFactory.getInstance()
       .createListPopupBuilder(myList)
-      .setItemChoosenCallback(() -> {
+      .setItemChosenCallback(() -> {
         myValue = myList.getSelectedValue();
         final ActionEvent event = new ActionEvent(myList, ActionEvent.ACTION_PERFORMED, "elementChosen");
         for (ActionListener listener : myListeners) {
diff --git a/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java b/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java
index 260295dabcb7..ee9151864aa5 100644
--- a/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java
+++ b/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java
@@ -40,7 +40,7 @@ public abstract class SchemesToImportPopup<T> {
   private void showList(JList list, Runnable selectAction) {
     JBPopupFactory.getInstance().createListPopupBuilder(list).
       setTitle(IdeBundle.message("popup.title.import.scheme")).
-      setItemChoosenCallback(selectAction).
+      setItemChosenCallback(selectAction).
       createPopup().
       showInCenterOf(myParent);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
index b671fe8bf7a6..99f95a04e97f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
@@ -324,7 +324,7 @@ public class FileTextFieldImpl implements FileTextField, Disposable {
         IdeFocusManager.getGlobalInstance().doWhenFocusSettlesDown(() -> IdeFocusManager.getGlobalInstance().requestFocus(getField(), true));
         return Boolean.TRUE;
       })
-      .setItemChoosenCallback(() -> processChosenFromCompletion(false))
+      .setItemChosenCallback(() -> processChosenFromCompletion(false))
       .setCancelKeyEnabled(false)
       .setAlpha(0.1f)
       .setFocusOwners(new Component[]{myPathTextField})
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java
index 8d2fb7c77685..07e0e0b03a33 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java
@@ -51,7 +51,7 @@ final class PopupListAdapter<T> implements PopupChooserBuilder.PopupComponentAda
 
   @Override
   public void setItemChosenCallback(Consumer<? super T> callback) {
-    myBuilder.setItemChoosenCallback(() -> {
+    myBuilder.setItemChosenCallback(() -> {
       T selectedValue = myList.getSelectedValue();
       if (selectedValue != null || !myList.isSelectionEmpty()) {
         callback.consume(selectedValue);
@@ -61,7 +61,7 @@ final class PopupListAdapter<T> implements PopupChooserBuilder.PopupComponentAda
 
   @Override
   public void setItemsChosenCallback(Consumer<? super Set<T>> callback) {
-    myBuilder.setItemChoosenCallback(() -> {
+    myBuilder.setItemChosenCallback(() -> {
       List<T> list = myList.getSelectedValuesList();
       callback.consume(list != null ? new HashSet<>(list) : Collections.emptySet());
     });
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java
index 2004d718f59a..294b63be10ca 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java
@@ -31,7 +31,7 @@ class PopupTreeAdapter<T> implements PopupChooserBuilder.PopupComponentAdapter<T
 
   @Override
   public void setItemChosenCallback(Consumer<? super T> callback) {
-    myBuilder.setItemChoosenCallback(() -> {
+    myBuilder.setItemChosenCallback(() -> {
       TreePath path = myTree.getSelectionModel().getLeadSelectionPath();
       T component = (T)path.getLastPathComponent();
       if (component != null) {
@@ -42,7 +42,7 @@ class PopupTreeAdapter<T> implements PopupChooserBuilder.PopupComponentAdapter<T
 
   @Override
   public void setItemsChosenCallback(Consumer<? super Set<T>> callback) {
-    myBuilder.setItemChoosenCallback(() -> {
+    myBuilder.setItemChosenCallback(() -> {
       final Set<T> selection = new HashSet<>();
       for (TreePath path : myTree.getSelectionModel().getSelectionPaths()) {
         Object component = path.getLastPathComponent();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java
index 332d582bebda..f4be2484659c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java
@@ -183,7 +183,7 @@ public class CompareWithSelectedRevisionAction extends DumbAwareAction {
 
     new PopupChooserBuilder(treeTable).
       setTitle(VcsBundle.message("lookup.title.vcs.file.revisions")).
-      setItemChoosenCallback(runnable).
+      setItemChosenCallback(runnable).
       setSouthComponent(createCommentsPanel(treeTable)).
       setResizable(true).
       setDimensionServiceKey("Vcs.CompareWithSelectedRevision.Popup").
@@ -304,7 +304,7 @@ public class CompareWithSelectedRevisionAction extends DumbAwareAction {
     }
 
     builder.setTitle(VcsBundle.message("lookup.title.vcs.file.revisions")).
-        setItemChoosenCallback(runnable).
+        setItemChosenCallback(runnable).
         setResizable(true).
         setDimensionServiceKey("Vcs.CompareWithSelectedRevision.Popup").setMinSize(new JBDimension(300, 300));
     final JBPopup popup = builder.createPopup();
diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataNavigationHandler.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataNavigationHandler.java
index 3b8388c4ef0e..a2eb73553bd0 100644
--- a/plugins/devkit/devkit-core/src/testAssistant/TestDataNavigationHandler.java
+++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataNavigationHandler.java
@@ -116,7 +116,7 @@ public class TestDataNavigationHandler implements GutterIconNavigationHandler<Ps
     JBPopupFactory.getInstance()
       .createListPopupBuilder(list)
       .setNamerForFiltering(element -> Objects.requireNonNull(ContainerUtil.getFirstItem(element.getTitleFragments())).first)
-      .setItemChoosenCallback(() -> {
+      .setItemChosenCallback(() -> {
         TestDataNavigationElement selectedElement = list.getSelectedValue();
         if (selectedElement != null) {
           selectedElement.performAction(project);
diff --git a/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginActionHandler.java b/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginActionHandler.java
index 558385fe73c5..09b1dd5467a5 100644
--- a/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginActionHandler.java
+++ b/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginActionHandler.java
@@ -84,7 +84,7 @@ class AddGradleDslPluginActionHandler implements CodeInsightActionHandler {
     else {
       JBPopupFactory.getInstance().createListPopupBuilder(list)
         .setTitle(GradleBundle.message("gradle.codeInsight.action.apply_plugin.popup.title"))
-        .setItemChoosenCallback(runnable)
+        .setItemChosenCallback(runnable)
         .setNamerForFiltering(o -> o.name())
         .createPopup()
         .showInBestPositionFor(editor);
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
index 62cc47928c0b..39d703fa8cc2 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
@@ -65,7 +65,7 @@ abstract class KotlinGenerateTestSupportActionBase(
 
             PopupChooserBuilder(list).setFilteringEnabled { (it as TestFramework).name }
                 .setTitle(KotlinBundle.message("action.generate.test.support.choose.framework"))
-                .setItemChoosenCallback { consumer(list.selectedValue as TestFramework) }
+                .setItemChosenCallback(consumer)
                 .setMovable(true)
                 .createPopup()
                 .showInBestPositionFor(editor)
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt
index ea4ea109404c..909f2088cba2 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt
@@ -133,11 +133,11 @@ abstract class ImplementAbstractMemberIntentionBase : SelfTargetingRangeIntentio
         member.toLightMethods().forEach { OverrideImplementUtil.overrideOrImplement(targetClass, it) }
     }
 
-    private fun implementInClass(member: KtNamedDeclaration, targetClasses: List<PsiElement>) {
+    private fun implementInClass(member: KtNamedDeclaration, targetClasses: Collection<PsiElement>) {
         val project = member.project
-        project.executeCommand<Unit>(JavaBundle.message("intention.implement.abstract.method.command.name")) {
+        project.executeCommand(JavaBundle.message("intention.implement.abstract.method.command.name")) {
             if (!FileModificationService.getInstance().preparePsiElementsForWrite(targetClasses)) return@executeCommand
-            runWriteAction<Unit> {
+            runWriteAction {
                 for (targetClass in targetClasses) {
                     try {
                         val descriptor = OpenFileDescriptor(project, targetClass.containingFile.virtualFile)
@@ -218,15 +218,12 @@ abstract class ImplementAbstractMemberIntentionBase : SelfTargetingRangeIntentio
             selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION
             cellRenderer = renderer
         }
-        val builder = PopupChooserBuilder<PsiElement>(list)
+        val builder = PopupChooserBuilder(list)
         renderer.installSpeedSearch(builder as IPopupChooserBuilder<*>)
         builder
             .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title"))
-            .setItemChoosenCallback {
-                val index = list.selectedIndex
-                if (index < 0) return@setItemChoosenCallback
-                @Suppress("UNCHECKED_CAST")
-                implementInClass(element, list.selectedValues.toList() as List<KtClassOrObject>)
+            .setItemsChosenCallback {
+                implementInClass(element, it)
             }
             .createPopup()
             .showInBestPositionFor(editor)
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenSelectProjectPopup.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenSelectProjectPopup.java
index d1bd80d229e0..78ba927a5783 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenSelectProjectPopup.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenSelectProjectPopup.java
@@ -140,7 +140,7 @@ public final class MavenSelectProjectPopup {
         JBPopup popup = new PopupChooserBuilder(projectTree)
           .setTitle(RunnerBundle.message("maven.select.project"))
           .setResizable(true)
-          .setItemChoosenCallback(clickCallBack).setAutoselectOnMouseMove(true)
+          .setItemChosenCallback(clickCallBack).setAutoselectOnMouseMove(true)
           .setCloseOnEnter(false)
           .createPopup();
 
diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/ui/impl/ElementChooserImpl.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/ui/impl/ElementChooserImpl.java
index d24ac0c8ed55..dd66fdbf76b8 100644
--- a/plugins/stream-debugger/src/com/intellij/debugger/streams/ui/impl/ElementChooserImpl.java
+++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/ui/impl/ElementChooserImpl.java
@@ -80,7 +80,7 @@ public class ElementChooserImpl<T extends ChooserOption> implements ElementChoos
       .setMovable(true)
       .setResizable(false)
       .setRequestFocus(true)
-      .setItemChoosenCallback(() -> callBack.chosen(list.getSelectedValue()))
+      .setItemChosenCallback(() -> callBack.chosen(list.getSelectedValue()))
       .addListener(new JBPopupListener() {
         @Override
         public void onClosed(@NotNull LightweightWindowEvent event) {
diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java
index b0d1299bd947..389b601a0bd0 100644
--- a/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java
+++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java
@@ -77,7 +77,7 @@ public final class SaveTo implements SpellCheckerQuickFix, LowPriorityAction {
           JBPopupFactory.getInstance()
             .createListPopupBuilder(dictList)
             .setTitle(SpellCheckerBundle.message("select.dictionary.title"))
-            .setItemChoosenCallback(
+            .setItemChosenCallback(
               () ->
                 CommandProcessor.getInstance().executeCommand(
                   project,