diff --git a/src/message.rs b/src/message.rs
index 4e7700a..932c899 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -8,7 +8,7 @@ use std::{
 use tokio::time;
 use tokio_tungstenite::tungstenite::Message;
 
-use sdk_common::network::{AnkFlag, AnkNetworkMsg, FaucetMessage, NewTxMessage};
+use sdk_common::network::{AnkFlag, Envelope, FaucetMessage, NewTxMessage};
 
 use crate::{faucet::handle_faucet_request, handle_new_tx_request, PEERMAP};
 
@@ -86,7 +86,7 @@ pub(crate) fn broadcast_message(
     broadcast: BroadcastType,
 ) -> Result<()> {
     let peers = PEERMAP.get().ok_or(Error::msg("Unitialized peer map"))?;
-    let ank_msg = AnkNetworkMsg {
+    let ank_msg = Envelope {
         flag,
         content: payload,
     };
@@ -126,7 +126,7 @@ pub(crate) fn broadcast_message(
     Ok(())
 }
 
-fn process_faucet_message(ank_msg: AnkNetworkMsg, addr: SocketAddr) {
+fn process_faucet_message(ank_msg: Envelope, addr: SocketAddr) {
     log::debug!("Received a faucet message");
     if let Ok(mut content) = serde_json::from_str::<FaucetMessage>(&ank_msg.content) {
         match handle_faucet_request(&content) {
@@ -152,7 +152,7 @@ fn process_faucet_message(ank_msg: AnkNetworkMsg, addr: SocketAddr) {
     }
 }
 
-fn process_new_tx_message(ank_msg: AnkNetworkMsg, addr: SocketAddr) {
+fn process_new_tx_message(ank_msg: Envelope, addr: SocketAddr) {
     log::debug!("Received a new tx message");
     if let Ok(mut new_tx_msg) = serde_json::from_str::<NewTxMessage>(&ank_msg.content) {
         match handle_new_tx_request(&mut new_tx_msg) {
@@ -183,7 +183,7 @@ fn process_new_tx_message(ank_msg: AnkNetworkMsg, addr: SocketAddr) {
     }
 }
 
-fn process_cipher_message(ank_msg: AnkNetworkMsg, addr: SocketAddr) {
+fn process_cipher_message(ank_msg: Envelope, addr: SocketAddr) {
     // For now we just send it to everyone
     log::debug!("Received a cipher message");
 
@@ -216,7 +216,7 @@ pub fn process_message(raw_msg: &str, addr: SocketAddr) {
     } else {
         cache.insert(raw_msg.to_owned());
     }
-    match serde_json::from_str::<AnkNetworkMsg>(raw_msg) {
+    match serde_json::from_str::<Envelope>(raw_msg) {
         Ok(ank_msg) => match ank_msg.flag {
             AnkFlag::Faucet => process_faucet_message(ank_msg, addr),
             AnkFlag::NewTx => process_new_tx_message(ank_msg, addr),