diff --git a/examples/eth-dm/src/App.tsx b/examples/eth-dm/src/App.tsx
index 222586520f..10bec9feb3 100644
--- a/examples/eth-dm/src/App.tsx
+++ b/examples/eth-dm/src/App.tsx
@@ -17,8 +17,8 @@ import { Message, Messages } from './Messages';
 import 'fontsource-roboto';
 import { Button } from '@material-ui/core';
 import { SendMessage } from './SendMessage';
-import { SaveKeyToStorage } from './key_handling/SaveKeyToStorage';
-import { LoadKeyFromStorage } from './key_handling/LoadKeyFromStorage';
+import { SaveKeyPair } from './key_pair_handling/SaveKeyPair';
+import { LoadKeyPair } from './key_pair_handling/LoadKeyPair';
 
 export const PublicKeyContentTopic = '/eth-dm/1/public-key/json';
 export const DirectMessageContentTopic = '/eth-dm/1/direct-message/json';
@@ -158,7 +158,7 @@ function App() {
             flexWrap: 'wrap',
           }}
         >
-          <LoadKeyFromStorage
+          <LoadKeyPair
             setEthDmKeyPair={(keyPair) => setEthDmKeyPair(keyPair)}
             disabled={!!ethDmKeyPair}
           />
@@ -170,7 +170,7 @@ function App() {
             flexWrap: 'wrap',
           }}
         >
-          <SaveKeyToStorage ethDmKeyPair={ethDmKeyPair} />
+          <SaveKeyPair ethDmKeyPair={ethDmKeyPair} />
         </div>
         <div>
           <Button
diff --git a/examples/eth-dm/src/key_handling/LoadKeyFromStorage.tsx b/examples/eth-dm/src/key_pair_handling/LoadKeyPair.tsx
similarity index 92%
rename from examples/eth-dm/src/key_handling/LoadKeyFromStorage.tsx
rename to examples/eth-dm/src/key_pair_handling/LoadKeyPair.tsx
index d3022b9377..63739cb6e7 100644
--- a/examples/eth-dm/src/key_handling/LoadKeyFromStorage.tsx
+++ b/examples/eth-dm/src/key_pair_handling/LoadKeyPair.tsx
@@ -1,6 +1,6 @@
 import { Button, TextField } from '@material-ui/core';
 import React, { ChangeEvent, useState } from 'react';
-import { loadKeyPairFromStorage } from './key_storage';
+import { loadKeyPairFromStorage } from './key_pair_storage';
 import { KeyPair } from '../crypto';
 
 export interface Props {
@@ -8,7 +8,7 @@ export interface Props {
   disabled: boolean;
 }
 
-export function LoadKeyFromStorage(props: Props) {
+export function LoadKeyPair(props: Props) {
   const [password, setPassword] = useState<string>();
 
   const disabled = props.disabled;
diff --git a/examples/eth-dm/src/key_handling/SaveKeyToStorage.tsx b/examples/eth-dm/src/key_pair_handling/SaveKeyPair.tsx
similarity index 92%
rename from examples/eth-dm/src/key_handling/SaveKeyToStorage.tsx
rename to examples/eth-dm/src/key_pair_handling/SaveKeyPair.tsx
index e57287d1a9..6b2a8543f6 100644
--- a/examples/eth-dm/src/key_handling/SaveKeyToStorage.tsx
+++ b/examples/eth-dm/src/key_pair_handling/SaveKeyPair.tsx
@@ -1,13 +1,13 @@
 import { Button, TextField } from '@material-ui/core';
 import React, { ChangeEvent, useState } from 'react';
 import { KeyPair } from '../crypto';
-import { saveKeyPairToStorage } from './key_storage';
+import { saveKeyPairToStorage } from './key_pair_storage';
 
 export interface Props {
   ethDmKeyPair: KeyPair | undefined;
 }
 
-export function SaveKeyToStorage(props: Props) {
+export function SaveKeyPair(props: Props) {
   const [password, setPassword] = useState<string>();
 
   const ethDmKeyPair = props.ethDmKeyPair;
diff --git a/examples/eth-dm/src/key_handling/key_storage.ts b/examples/eth-dm/src/key_pair_handling/key_pair_storage.ts
similarity index 100%
rename from examples/eth-dm/src/key_handling/key_storage.ts
rename to examples/eth-dm/src/key_pair_handling/key_pair_storage.ts