diff --git a/orca/tests/test_lte_parsing.rs b/orca/tests/test_lte_parsing.rs
index 859e5f3..48a219c 100644
--- a/orca/tests/test_lte_parsing.rs
+++ b/orca/tests/test_lte_parsing.rs
@@ -1,10 +1,10 @@
-use wavehunter::diag::{
+use orca::diag::{
     Message,
     LogBody,
     LteRrcOtaPacket,
     Timestamp,
 };
-use wavehunter::gsmtap_parser::GsmtapParser;
+use orca::gsmtap_parser::GsmtapParser;
 use deku::prelude::*;
 
 // Tests here are based on https://github.com/fgsect/scat/blob/97442580e628de414c9f7c2a185f4e28d0ee7523/tests/test_diagltelogparser.py
diff --git a/wavehunter/src/main.rs b/wavehunter/src/main.rs
index 6e106c9..f75ad04 100644
--- a/wavehunter/src/main.rs
+++ b/wavehunter/src/main.rs
@@ -2,10 +2,11 @@ use axum::body::Body;
 use axum::http::header::CONTENT_TYPE;
 use futures_core::Stream;
 use log::error;
-use wavehunter::diag_device::{DiagDevice, DiagDeviceError};
-use wavehunter::diag_reader::DiagReader;
-use wavehunter::gsmtap_parser::GsmtapParser;
-use wavehunter::pcap::GsmtapPcapWriter;
+use orca::diag_device::{DiagDevice, DiagDeviceError};
+use orca::diag_reader::DiagReader;
+use orca::gsmtap_parser::GsmtapParser;
+use orca::pcap::GsmtapPcapWriter;
+use orca::qmdl::{QmdlReader, QmdlReaderError};
 
 use axum::Router;
 use axum::extract::State;
@@ -15,7 +16,6 @@ use axum::routing::get;
 use std::fs::File;
 use thiserror::Error;
 use serde::Deserialize;
-use wavehunter::qmdl::{QmdlReader, QmdlReaderError};
 use std::io::Write;
 use std::sync::Arc;
 use std::net::SocketAddr;