diff --git a/docs/devnet.md b/docs/devnet.md
index 9e063fae..30b88e60 100644
--- a/docs/devnet.md
+++ b/docs/devnet.md
@@ -6,7 +6,7 @@
 | Test ERC20         | ETH             | 0x0290FB167208Af455bB137780163b7B7a9a10C16                                                            | Tokens minted to Test Wallet                                                                                                                                   |
 | Bridge Core        | ETH             | 0x254dffcd3277c0b1660f6d42efbb754edababc2b                                                            |                                                                                                                                                                |
 | Token Bridge       | ETH             | 0xe982e462b094850f12af94d21d470e21be9d0e9c                                                            |                                                                                                                                                                |
-| Test Wallet        | SOL             | 6sbzC1eH4FTujJXWj51eQe25cYvr4xfXbJ1vAj7j2k5J                                                          | Key in `solana/id.json`                                                                                                                                        |
+| Test Wallet        | SOL             | 6sbzC1eH4FTujJXWj51eQe25cYvr4xfXbJ1vAj7j2k5J                                                          | Key in `solana/keys/solana-devnet.json`                                                                                                                                        |
 | Example Token      | SOL             | 2WDq7wSs9zYrpx2kbHDA4RUTRch2CCTP6ZWaH4GNfnQQ                                                          | Tokens minted to Test Wallet                                                                                                                                   |
 | Bridge Core        | SOL             | Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o                                                           |                                                                                                                                                                |
 | Token Bridge       | SOL             | B6RHG3mfcckmrYN1UhmJzyS1XX3fZKbkeUcpJe9Sy3FE                                                          |                                                                                                                                                                |
@@ -18,4 +18,4 @@
 
 ### Terra
 
-The terra testnet can be used just like a normal localterra network (can be selected in finder and station).
\ No newline at end of file
+The terra testnet can be used just like a normal localterra network (can be selected in finder and station).
diff --git a/solana/Dockerfile b/solana/Dockerfile
index f0b15f5a..ebbbab1b 100644
--- a/solana/Dockerfile
+++ b/solana/Dockerfile
@@ -28,4 +28,4 @@ RUN --mount=type=cache,target=/usr/local,from=rust,source=/usr/local \
     mkdir -p /opt/solana/deps && \
     cp bridge/target/deploy/bridge.so /opt/solana/deps/bridge.so && \
     cp bridge/target/deploy/cpi_poster.so /opt/solana/deps/cpi_poster.so && \
-    cp modules/token_bridge/target/deploy/token_bridge.so /opt/solana/deps/token_bridge.so
\ No newline at end of file
+    cp modules/token_bridge/target/deploy/token_bridge.so /opt/solana/deps/token_bridge.so
diff --git a/solana/devnet_setup.sh b/solana/devnet_setup.sh
index 14be9270..e174629b 100755
--- a/solana/devnet_setup.sh
+++ b/solana/devnet_setup.sh
@@ -7,7 +7,7 @@ mkdir -p ~/.config/solana/cli
 cat <<EOF > ~/.config/solana/cli/config.yml
 json_rpc_url: "http://127.0.0.1:8899"
 websocket_url: ""
-keypair_path: /usr/src/solana/id.json
+keypair_path: /usr/src/solana/keys/solana-devnet.json
 EOF
 
 # Static key for the mint so it always has the same address
@@ -29,7 +29,7 @@ retry () {
   done
 }
 
-# Fund our account (as seen in id.json).
+# Fund our account (as seen in solana-devnet.json).
 retry solana airdrop 1000 --faucet-port 9900 --faucet-host 127.0.0.1
 
 # Create a new SPL token
diff --git a/solana/id.json b/solana/keys/solana-devnet.json
similarity index 100%
rename from solana/id.json
rename to solana/keys/solana-devnet.json