diff --git a/Cargo.toml b/Cargo.toml
index a915ee8..6ebe3f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
-name = "hyper_x_cloud_ii_wireless"
+name = "hyper_headset"
 version = "1.1.0"
 edition = "2021"
 authors = ["Lennard Kittner"]
 description = "A CLI and tray application for monitoring and managing HyperX headsets."
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 clap = { version = "4.5.32", features = ["derive"] }
 hidapi = "2.3.3"
diff --git a/README.md b/README.md
index 166b9cd..8db0a76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# HyperXCloudIIWireless
+# HyperHeadset
 A CLI and tray application for monitoring and managing HyperX headsets.
 
 <img src=./screenshots/tray_app.png alt="tray_app" width="400">
@@ -83,8 +83,10 @@ You can also download a compiled version from [releases](https://github.com/Lenn
 ## Usage
 
 ```
-cli_app --help
-Usage: cli_app [OPTIONS]
+hyper_headset_cli --help
+A CLI and tray application for monitoring and managing HyperX headsets.
+
+Usage: hyper_headset_cli [OPTIONS]
 
 Options:
       --automatic_shutdown <automatic_shutdown>
@@ -103,9 +105,9 @@ Options:
   -V, --version
           Print version
 ```
-`cli_app` without any arguments will print all available headset information.
+`hyper_headset_cli` without any arguments will print all available headset information.
 
-`hyper_x_cloud_ii_wireless` without any arguments will start the tray application. 
+`hyper_headset` without any arguments will start the tray application. 
 Once it's open, hover over the headset icon in the system tray or right-click to view details such as the battery level. 
 You can also exit via the right-clock menu.
 
diff --git a/src/bin/cli_app.rs b/src/bin/hyper_headset_cli.rs
similarity index 97%
rename from src/bin/cli_app.rs
rename to src/bin/hyper_headset_cli.rs
index 62f4929..f1b5fb4 100644
--- a/src/bin/cli_app.rs
+++ b/src/bin/hyper_headset_cli.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use clap::{Arg, Command};
-use hyper_x_cloud_ii_wireless::devices::{cloud_ii_wireless_dts::CloudIIWirelessDTS, Device};
+use hyper_headset::devices::{cloud_ii_wireless_dts::CloudIIWirelessDTS, Device};
 
 fn main() {
     let matches = Command::new(env!("CARGO_PKG_NAME"))
diff --git a/src/main.rs b/src/main.rs
index 05d3963..e27c26b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 mod status_tray;
-use hyper_x_cloud_ii_wireless::devices::{connect_compatible_device, DeviceError};
+use hyper_headset::devices::connect_compatible_device;
 use status_tray::{StatusTray, TrayHandler};
 
 fn main() {
diff --git a/src/status_tray.rs b/src/status_tray.rs
index d4380c3..bc13411 100644
--- a/src/status_tray.rs
+++ b/src/status_tray.rs
@@ -1,4 +1,4 @@
-use hyper_x_cloud_ii_wireless::devices::DeviceState;
+use hyper_headset::devices::DeviceState;
 use ksni::{menu::StandardItem, Handle, MenuItem, ToolTip, Tray, TrayService};
 
 pub struct TrayHandler {