diff --git a/platform/credential-store/src/PasswordSafeImpl.kt b/platform/credential-store/src/PasswordSafeImpl.kt
index d3851496f39a..7acaa69c65b5 100644
--- a/platform/credential-store/src/PasswordSafeImpl.kt
+++ b/platform/credential-store/src/PasswordSafeImpl.kt
@@ -82,7 +82,7 @@ class PasswordSafeImpl(/* public - backward compatibility */val settings: Passwo
     }
   }
 
-  override fun setPassword(attributes: CredentialAttributes, credentials: Credentials?, memoryOnly: Boolean) {
+  override fun set(attributes: CredentialAttributes, credentials: Credentials?, memoryOnly: Boolean) {
     if (memoryOnly) {
       memoryHelperProvider.value.set(attributes, credentials)
       // remove to ensure that on getPassword we will not return some value from default provider
diff --git a/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt b/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
index 82312f090ceb..709596eec04f 100644
--- a/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
+++ b/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
@@ -98,7 +98,7 @@ class OneTimeString @JvmOverloads constructor(value: CharArray, offset: Int = 0,
     }
 
     if (!willBeCleared) {
-      consumed.get()?.let { throw IllegalStateException("Already consumed at $it") }
+      consumed.get()?.let { throw IllegalStateException("Already consumed: $it\n---\n") }
     }
     else if (!consumed.compareAndSet(null, ExceptionUtil.currentStackTrace())) {
       throw IllegalStateException("Already consumed at ${consumed.get()}")
diff --git a/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordSafe.java b/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordSafe.java
index 5604a9852b1c..6e33704d415d 100644
--- a/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordSafe.java
+++ b/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordSafe.java
@@ -27,7 +27,7 @@ public abstract class PasswordSafe implements PasswordStorage {
     return ServiceManager.getService(PasswordSafe.class);
   }
 
-  public abstract void setPassword(@NotNull CredentialAttributes attributes, @Nullable Credentials credentials, boolean memoryOnly);
+  public abstract void set(@NotNull CredentialAttributes attributes, @Nullable Credentials credentials, boolean memoryOnly);
 
   public abstract boolean isMemoryOnly();
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
index 85be0f5908d4..c1d23f9985d6 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
@@ -149,7 +149,7 @@ public class PasswordSafePromptDialog extends DialogWrapper {
       if (d.showAndGet()) {
         Credentials credentials = new Credentials(component.getUserName(), new OneTimeString(component.getPassword()));
         ref.set(credentials);
-        ps.setPassword(CredentialAttributes(requestor, accountName), credentials, !component.isRememberSelected());
+        ps.set(CredentialAttributes(requestor, accountName), credentials, !component.isRememberSelected());
       }
     }, ModalityState.any());
     Credentials credentials = ref.get();
diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
index 0122231f179e..4276569727d9 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
@@ -173,7 +173,7 @@ class GitHttpGuiAuthenticator implements GitHttpAuthenticator {
     // save password
     if (myPasswordKey != null && myPassword != null) {
       Credentials credentials = new Credentials(myPasswordKey, new OneTimeString(myPassword));
-      PasswordSafe.getInstance().setPassword(CredentialAttributes(PASS_REQUESTER, credentials.getUserName()), credentials, !mySaveOnDisk);
+      PasswordSafe.getInstance().set(CredentialAttributes(PASS_REQUESTER, credentials.getUserName()), credentials, !mySaveOnDisk);
     }
   }
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
index 84a8f9249a5e..b6515952ba05 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
@@ -131,7 +131,7 @@ class HgCommandAuthenticator {
         ok = true;
         Credentials credentials = new Credentials(dialog.getUsername(), new OneTimeString(dialog.getPassword()));
         myCredentials = credentials;
-        PasswordSafe.getInstance().setPassword(CredentialAttributes(HgCommandAuthenticator.class, keyForUrlAndLogin(url, credentials.getUserName())), credentials, !dialog.isRememberPassword());
+        PasswordSafe.getInstance().set(CredentialAttributes(HgCommandAuthenticator.class, keyForUrlAndLogin(url, credentials.getUserName())), credentials, !dialog.isRememberPassword());
         hgGlobalSettings.addRememberedUrl(url, credentials.getUserName());
       }
     }