diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/settings/EfCoreUiConfigurable.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/settings/EfCoreUiConfigurable.kt
index 82fa354e..a2362f4e 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/settings/EfCoreUiConfigurable.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/settings/EfCoreUiConfigurable.kt
@@ -11,21 +11,21 @@ class EfCoreUiConfigurable : BoundConfigurable(EfCoreUiBundle.message("configura
     private val settingsStateService = EfCoreUiSettingsStateService.getInstance()
 
     override fun createPanel() = panel {
-        group(EfCoreUiBundle.message("section.dialogs.data")) {
+        group(EfCoreUiBundle.message("section.autofill")) {
             row {
-                checkBox(EfCoreUiBundle.message("checkbox.use.previously.selected.options.in.dialogs"))
+                checkBox(EfCoreUiBundle.message("checkbox.autofill.general.options"))
                     .bindSelected(settingsStateService::usePreviouslySelectedOptionsInDialogs)
                     .align(AlignX.FILL)
-                    .comment(EfCoreUiBundle.message("reuse.data.comment"))
+                    .comment(EfCoreUiBundle.message("checkbox.autofill.general.options.comment"))
             }
             row {
-                checkBox(EfCoreUiBundle.message("checkbox.store.sensitive.data.in.secure.store"))
+                checkBox(EfCoreUiBundle.message("checkbox.autofill.additional.options"))
                     .bindSelected(settingsStateService::storeSensitiveData)
                     .align(AlignX.FILL)
-                    .comment(EfCoreUiBundle.message("sensitive.reuse.comment"))
+                    .comment(EfCoreUiBundle.message("checkbox.autofill.additional.options.comment"))
             }
             row {
-                button(EfCoreUiBundle.message("button.clear.stored.data")) {
+                button(EfCoreUiBundle.message("button.clear.stored.options")) {
                     DialogsStateService.getInstance().clearState()
                 }
             }
diff --git a/src/rider/main/resources/messages/EfCoreUiBundle.properties b/src/rider/main/resources/messages/EfCoreUiBundle.properties
index d5f9a58b..1a249e72 100644
--- a/src/rider/main/resources/messages/EfCoreUiBundle.properties
+++ b/src/rider/main/resources/messages/EfCoreUiBundle.properties
@@ -169,12 +169,12 @@ action.try.again.text=Try Again
 #
 # Settings
 configurable.name.ef.core.ui=EF Core UI
-section.dialogs.data=Dialogs Data
-checkbox.use.previously.selected.options.in.dialogs=Use previously selected options in dialogs
-reuse.data.comment=<b>Experimental</b>: If enabled, next opened dialog instance will reuse data from a previous one
-checkbox.store.sensitive.data.in.secure.store=Store sensitive data in a secure store
-sensitive.reuse.comment=If enabled, plugin will securely store data that may contain credentials, such as "Additional arguments" or "Connection" fields<br/><b>Please use this option carefully</b>, as it could lead to accidents on non-local environments
-button.clear.stored.data=Clear Stored Data
+section.autofill=Autofill
+checkbox.autofill.general.options=Autofill general options
+checkbox.autofill.general.options.comment=Reuses general options, such as previously selected projects in EF Core action dialogs
+checkbox.autofill.additional.options=Autofill additional options
+checkbox.autofill.additional.options.comment=Reuses previously specified connection strings and related options in EF Core action dialogs<br/><b>Use with care to prevent accidental non-local database modifications</b>
+button.clear.stored.options=Clear Stored Options
 checkbox.execute.commands.in.terminal=Execute commands in terminal
 execute.in.terminal.comment=If enabled, command will be executed in the terminal with full output available