diff --git a/lib/actions/user-actions.js b/lib/actions/user-actions.js
--- a/lib/actions/user-actions.js
+++ b/lib/actions/user-actions.js
@@ -476,12 +476,12 @@
   return useKeyserverCall(logIn);
 }
 
-const changeUserPasswordActionTypes = Object.freeze({
-  started: 'CHANGE_USER_PASSWORD_STARTED',
-  success: 'CHANGE_USER_PASSWORD_SUCCESS',
-  failed: 'CHANGE_USER_PASSWORD_FAILED',
+const changeKeyserverUserPasswordActionTypes = Object.freeze({
+  started: 'CHANGE_KEYSERVER_USER_PASSWORD_STARTED',
+  success: 'CHANGE_KEYSERVER_USER_PASSWORD_SUCCESS',
+  failed: 'CHANGE_KEYSERVER_USER_PASSWORD_FAILED',
 });
-const changeUserPassword =
+const changeKeyserverUserPassword =
   (
     callServerEndpoint: CallServerEndpoint,
   ): ((passwordUpdate: PasswordUpdate) => Promise<void>) =>
@@ -647,8 +647,8 @@
 const setAccessTokenActionType = 'SET_ACCESS_TOKEN';
 
 export {
-  changeUserPasswordActionTypes,
-  changeUserPassword,
+  changeKeyserverUserPasswordActionTypes,
+  changeKeyserverUserPassword,
   claimUsernameActionTypes,
   useClaimUsername,
   useDeleteKeyserverAccount,
diff --git a/lib/types/redux-types.js b/lib/types/redux-types.js
--- a/lib/types/redux-types.js
+++ b/lib/types/redux-types.js
@@ -374,18 +374,18 @@
       +loadingInfo: LoadingInfo,
     }
   | {
-      +type: 'CHANGE_USER_PASSWORD_STARTED',
+      +type: 'CHANGE_KEYSERVER_USER_PASSWORD_STARTED',
       +payload?: void,
       +loadingInfo: LoadingInfo,
     }
   | {
-      +type: 'CHANGE_USER_PASSWORD_FAILED',
+      +type: 'CHANGE_KEYSERVER_USER_PASSWORD_FAILED',
       +error: true,
       +payload: Error,
       +loadingInfo: LoadingInfo,
     }
   | {
-      +type: 'CHANGE_USER_PASSWORD_SUCCESS',
+      +type: 'CHANGE_KEYSERVER_USER_PASSWORD_SUCCESS',
       +payload?: void,
       +loadingInfo: LoadingInfo,
     }
diff --git a/native/profile/edit-password.react.js b/native/profile/edit-password.react.js
--- a/native/profile/edit-password.react.js
+++ b/native/profile/edit-password.react.js
@@ -12,8 +12,8 @@
 import { ScrollView } from 'react-native-gesture-handler';
 
 import {
-  changeUserPasswordActionTypes,
-  changeUserPassword,
+  changeKeyserverUserPasswordActionTypes,
+  changeKeyserverUserPassword,
 } from 'lib/actions/user-actions.js';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
 import type { LoadingStatus } from 'lib/types/loading-types.js';
@@ -103,7 +103,9 @@
   // Redux dispatch functions
   +dispatchActionPromise: DispatchActionPromise,
   // async functions that hit server APIs
-  +changeUserPassword: (passwordUpdate: PasswordUpdate) => Promise<void>,
+  +changeKeyserverUserPassword: (
+    passwordUpdate: PasswordUpdate,
+  ) => Promise<void>,
 };
 type State = {
   +currentPassword: string,
@@ -275,7 +277,7 @@
       this.goBackOnce();
     } else {
       void this.props.dispatchActionPromise(
-        changeUserPasswordActionTypes,
+        changeKeyserverUserPasswordActionTypes,
         this.savePassword(),
       );
     }
@@ -287,7 +289,7 @@
       return;
     }
     try {
-      await this.props.changeUserPassword({
+      await this.props.changeKeyserverUserPassword({
         updatedFields: {
           password: this.state.newPassword,
         },
@@ -337,7 +339,7 @@
 }
 
 const loadingStatusSelector = createLoadingStatusSelector(
-  changeUserPasswordActionTypes,
+  changeKeyserverUserPasswordActionTypes,
 );
 
 const ConnectedEditPassword: React.ComponentType<BaseProps> =
@@ -353,7 +355,9 @@
     const styles = useStyles(unboundStyles);
 
     const dispatchActionPromise = useDispatchActionPromise();
-    const callChangeUserPassword = useServerCall(changeUserPassword);
+    const callChangeKeyserverUserPassword = useServerCall(
+      changeKeyserverUserPassword,
+    );
 
     return (
       <EditPassword
@@ -363,7 +367,7 @@
         colors={colors}
         styles={styles}
         dispatchActionPromise={dispatchActionPromise}
-        changeUserPassword={callChangeUserPassword}
+        changeKeyserverUserPassword={callChangeKeyserverUserPassword}
       />
     );
   });
diff --git a/web/settings/password-change-modal.js b/web/settings/password-change-modal.js
--- a/web/settings/password-change-modal.js
+++ b/web/settings/password-change-modal.js
@@ -4,8 +4,8 @@
 import * as React from 'react';
 
 import {
-  changeUserPasswordActionTypes,
-  changeUserPassword,
+  changeKeyserverUserPasswordActionTypes,
+  changeKeyserverUserPassword,
 } from 'lib/actions/user-actions.js';
 import { useModalContext } from 'lib/components/modal-provider.react.js';
 import { useStringForUser } from 'lib/hooks/ens-cache.js';
@@ -26,7 +26,9 @@
 type Props = {
   +inputDisabled: boolean,
   +dispatchActionPromise: DispatchActionPromise,
-  +changeUserPassword: (passwordUpdate: PasswordUpdate) => Promise<void>,
+  +changeKeyserverUserPassword: (
+    passwordUpdate: PasswordUpdate,
+  ) => Promise<void>,
   +popModal: () => void,
   +stringForUser: ?string,
 };
@@ -183,14 +185,14 @@
     }
 
     void this.props.dispatchActionPromise(
-      changeUserPasswordActionTypes,
+      changeKeyserverUserPasswordActionTypes,
       this.changeUserSettingsAction(),
     );
   };
 
   async changeUserSettingsAction(): Promise<void> {
     try {
-      await this.props.changeUserPassword({
+      await this.props.changeKeyserverUserPassword({
         updatedFields: {
           password: this.state.newPassword,
         },
@@ -231,15 +233,17 @@
   }
 }
 
-const changeUserPasswordLoadingStatusSelector = createLoadingStatusSelector(
-  changeUserPasswordActionTypes,
-);
+const changeKeyserverUserPasswordLoadingStatusSelector =
+  createLoadingStatusSelector(changeKeyserverUserPasswordActionTypes);
 const ConnectedPasswordChangeModal: React.ComponentType<{}> = React.memo<{}>(
   function ConnectedPasswordChangeModal(): React.Node {
     const inputDisabled = useSelector(
-      state => changeUserPasswordLoadingStatusSelector(state) === 'loading',
+      state =>
+        changeKeyserverUserPasswordLoadingStatusSelector(state) === 'loading',
+    );
+    const callChangeKeyserverUserPassword = useServerCall(
+      changeKeyserverUserPassword,
     );
-    const callChangeUserPassword = useServerCall(changeUserPassword);
     const dispatchActionPromise = useDispatchActionPromise();
 
     const modalContext = useModalContext();
@@ -250,7 +254,7 @@
     return (
       <PasswordChangeModal
         inputDisabled={inputDisabled}
-        changeUserPassword={callChangeUserPassword}
+        changeKeyserverUserPassword={callChangeKeyserverUserPassword}
         dispatchActionPromise={dispatchActionPromise}
         popModal={modalContext.popModal}
         stringForUser={stringForUser}