diff --git a/src/actions/SessionStorageActions.js b/src/actions/SessionStorageActions.js
index 6a163b08..6e696960 100644
--- a/src/actions/SessionStorageActions.js
+++ b/src/actions/SessionStorageActions.js
@@ -2,7 +2,7 @@
 import * as storageUtils from 'utils/storage';
 import { findToken } from 'reducers/TokensReducer';
 
-import type { State as SendFormState } from 'reducers/SendFormReducer';
+import type { State as SendFormState } from 'reducers/SendFormEthereumReducer';
 import type {
     ThunkAction,
     PayloadAction,
@@ -20,7 +20,7 @@ const getTxDraftKey = (getState: GetState): string => {
 };
 
 export const saveDraftTransaction = (): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
-    const state = getState().sendForm;
+    const state = getState().sendFormEthereum;
     if (state.untouched) return;
 
     const key = getTxDraftKey(getState);
diff --git a/src/components/modals/Container.js b/src/components/modals/Container.js
index 62944a43..3a80f075 100644
--- a/src/components/modals/Container.js
+++ b/src/components/modals/Container.js
@@ -19,7 +19,7 @@ type StateProps = {
     devices: $ElementType<State, 'devices'>,
     connect: $ElementType<State, 'connect'>,
     selectedAccount: $ElementType<State, 'selectedAccount'>,
-    sendForm: $ElementType<State, 'sendForm'>,
+    sendForm: $ElementType<State, 'sendFormEthereum'>,
     receive: $ElementType<State, 'receive'>,
     localStorage: $ElementType<State, 'localStorage'>,
     wallet: $ElementType<State, 'wallet'>,
@@ -38,7 +38,7 @@ const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: St
     devices: state.devices,
     connect: state.connect,
     selectedAccount: state.selectedAccount,
-    sendForm: state.sendForm,
+    sendForm: state.sendFormEthereum,
     receive: state.receive,
     localStorage: state.localStorage,
     wallet: state.wallet,
diff --git a/src/services/WalletService.js b/src/services/WalletService.js
index b892a0c9..0c44a3a3 100644
--- a/src/services/WalletService.js
+++ b/src/services/WalletService.js
@@ -9,7 +9,7 @@ import * as NotificationActions from 'actions/NotificationActions';
 import * as LocalStorageActions from 'actions/LocalStorageActions';
 import * as TrezorConnectActions from 'actions/TrezorConnectActions';
 import * as SelectedAccountActions from 'actions/SelectedAccountActions';
-import * as SendFormActionActions from 'actions/SendFormActions';
+import * as SendFormActions from 'actions/SendFormActions';
 import * as DiscoveryActions from 'actions/DiscoveryActions';
 import * as RouterActions from 'actions/RouterActions';
 
@@ -102,7 +102,7 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
         // if "selectedDevice" didn't change observe common values in SelectedAccountReducer
         if (!await api.dispatch(SelectedAccountActions.observe(prevState, action))) {
             // if "selectedAccount" didn't change observe send form props changes
-            api.dispatch(SendFormActionActions.observe(prevState, action));
+            api.dispatch(SendFormActions.observe(prevState, action));
         }
     } else {
         // no changes in common values
diff --git a/src/views/Wallet/views/Account/Send/ethereum/Container.js b/src/views/Wallet/views/Account/Send/ethereum/Container.js
index eac00b9f..19982c8f 100644
--- a/src/views/Wallet/views/Account/Send/ethereum/Container.js
+++ b/src/views/Wallet/views/Account/Send/ethereum/Container.js
@@ -3,7 +3,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import SendFormActions from 'actions/SendFormActions';
+import SendFormActions from 'actions/ethereum/SendFormActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 import AccountSend from './index';
@@ -12,7 +12,7 @@ type OwnProps = {}
 
 export type StateProps = {
     selectedAccount: $ElementType<State, 'selectedAccount'>,
-    sendForm: $ElementType<State, 'sendForm'>,
+    sendForm: $ElementType<State, 'sendFormEthereum'>,
     wallet: $ElementType<State, 'wallet'>,
     fiat: $ElementType<State, 'fiat'>,
     localStorage: $ElementType<State, 'localStorage'>,
@@ -26,7 +26,7 @@ export type Props = StateProps & DispatchProps;
 
 const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State): StateProps => ({
     selectedAccount: state.selectedAccount,
-    sendForm: state.sendForm,
+    sendForm: state.sendFormEthereum,
     wallet: state.wallet,
     fiat: state.fiat,
     localStorage: state.localStorage,
diff --git a/src/views/Wallet/views/Account/Send/ripple/Container.js b/src/views/Wallet/views/Account/Send/ripple/Container.js
index e282b52b..f68ffb71 100644
--- a/src/views/Wallet/views/Account/Send/ripple/Container.js
+++ b/src/views/Wallet/views/Account/Send/ripple/Container.js
@@ -3,7 +3,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import SendFormActions from 'actions/SendFormActions';
+import SendFormActions from 'actions/ripple/SendFormActions';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 import AccountSend from './index';
@@ -12,7 +12,7 @@ type OwnProps = { }
 
 export type StateProps = {
     selectedAccount: $ElementType<State, 'selectedAccount'>,
-    sendForm: $ElementType<State, 'sendForm'>,
+    sendForm: $ElementType<State, 'sendFormRipple'>,
     wallet: $ElementType<State, 'wallet'>,
     fiat: $ElementType<State, 'fiat'>,
     localStorage: $ElementType<State, 'localStorage'>,
@@ -26,7 +26,7 @@ export type Props = StateProps & DispatchProps;
 
 const mapStateToProps: MapStateToProps<State, OwnProps, StateProps> = (state: State): StateProps => ({
     selectedAccount: state.selectedAccount,
-    sendForm: state.sendForm,
+    sendForm: state.sendFormRipple,
     wallet: state.wallet,
     fiat: state.fiat,
     localStorage: state.localStorage,