diff --git a/Cargo.toml b/Cargo.toml
index bb61ca9..c5aaf56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ name = "tun2proxy-bin"
 path = "src/bin/main.rs"
 
 [[bin]]
-name = "udpgwserver"
+name = "udpgw-server"
 path = "src/bin/udpgw_server.rs"
 
 [profile.release]
diff --git a/src/args.rs b/src/args.rs
index ce4a4e7..5eaa052 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -70,14 +70,6 @@ pub struct Args {
     #[arg(short, long, default_value = if cfg!(target_os = "linux") { "false" } else { "true" })]
     pub setup: bool,
 
-    /// UDP gateway address
-    #[arg(long, value_name = "IP:PORT")]
-    pub udpgw_bind_addr: Option<SocketAddr>,
-
-    /// Max udpgw connections
-    #[arg(long, value_name = "number", default_value = "100")]
-    pub max_udpgw_connections: u16,
-
     /// DNS handling strategy
     #[arg(short, long, value_name = "strategy", value_enum, default_value = "direct")]
     pub dns: ArgDns,
@@ -119,6 +111,14 @@ pub struct Args {
     /// Maximum number of sessions to be handled concurrently
     #[arg(long, value_name = "number", default_value = "200")]
     pub max_sessions: usize,
+
+    /// UDP gateway server address, similar to badvpn-udpgw
+    #[arg(long, value_name = "IP:PORT")]
+    pub udpgw_server: Option<SocketAddr>,
+
+    /// Max udpgw connections
+    #[arg(long, value_name = "number")]
+    pub udpgw_max_connections: Option<u16>,
 }
 
 fn validate_tun(p: &str) -> Result<String> {
@@ -152,8 +152,8 @@ impl Default for Args {
             admin_command: Vec::new(),
             ipv6_enabled: false,
             setup,
-            udpgw_bind_addr: None,
-            max_udpgw_connections: 100,
+            udpgw_server: None,
+            udpgw_max_connections: None,
             dns: ArgDns::default(),
             dns_addr: "8.8.8.8".parse().unwrap(),
             bypass: vec![],
@@ -192,7 +192,7 @@ impl Args {
     }
 
     pub fn udpgw(&mut self, udpgw: SocketAddr) -> &mut Self {
-        self.udpgw_bind_addr = Some(udpgw);
+        self.udpgw_server = Some(udpgw);
         self
     }
 
diff --git a/src/bin/udpgw_server.rs b/src/bin/udpgw_server.rs
index 6e96dc2..386976f 100644
--- a/src/bin/udpgw_server.rs
+++ b/src/bin/udpgw_server.rs
@@ -10,7 +10,7 @@ use tokio::net::TcpListener;
 use tokio::net::UdpSocket;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::Sender;
-pub use tun2proxy::udpgw::*;
+use tun2proxy::udpgw::*;
 use tun2proxy::ArgVerbosity;
 use tun2proxy::Result;
 pub(crate) const CLIENT_DISCONNECT_TIMEOUT: tokio::time::Duration = std::time::Duration::from_secs(60);
diff --git a/src/lib.rs b/src/lib.rs
index 0ea57e2..f373c41 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -234,13 +234,13 @@ where
 
     let mut ip_stack = ipstack::IpStack::new(ipstack_config, device);
 
-    let udpgw_client = match args.udpgw_bind_addr {
+    let udpgw_client = match args.udpgw_server {
         None => None,
         Some(addr) => {
             log::info!("UDPGW enabled");
             let client = Arc::new(UdpGwClient::new(
                 mtu,
-                args.max_udpgw_connections,
+                args.udpgw_max_connections.unwrap_or(100),
                 UDPGW_KEEPALIVE_TIME,
                 args.udp_timeout,
                 addr,
@@ -346,7 +346,7 @@ where
                         SocketAddr::V4(_) => SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 0)),
                         SocketAddr::V6(_) => SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0)),
                     };
-                    let tcpinfo = SessionInfo::new(tcp_src, udpgw.get_udpgw_bind_addr(), IpProtocol::Tcp);
+                    let tcpinfo = SessionInfo::new(tcp_src, udpgw.get_server_addr(), IpProtocol::Tcp);
                     let proxy_handler = mgr.new_proxy_handler(tcpinfo, None, false).await?;
                     let socket_queue = socket_queue.clone();
                     tokio::spawn(async move {
diff --git a/src/udpgw.rs b/src/udpgw.rs
index eab915b..b26c9aa 100644
--- a/src/udpgw.rs
+++ b/src/udpgw.rs
@@ -212,13 +212,13 @@ pub(crate) struct UdpGwClient {
     max_connections: u16,
     udp_timeout: u64,
     keepalive_time: Duration,
-    udpgw_bind_addr: SocketAddr,
+    server_addr: SocketAddr,
     keepalive_packet: Vec<u8>,
     server_connections: Mutex<VecDeque<UdpGwClientStream>>,
 }
 
 impl UdpGwClient {
-    pub fn new(udp_mtu: u16, max_connections: u16, keepalive_time: Duration, udp_timeout: u64, udpgw_bind_addr: SocketAddr) -> Self {
+    pub fn new(udp_mtu: u16, max_connections: u16, keepalive_time: Duration, udp_timeout: u64, server_addr: SocketAddr) -> Self {
         let mut keepalive_packet = vec![];
         keepalive_packet.extend_from_slice(&(std::mem::size_of::<UdpgwHeader>() as u16).to_le_bytes());
         keepalive_packet.extend_from_slice(&[UDPGW_FLAG_KEEPALIVE, 0, 0]);
@@ -227,7 +227,7 @@ impl UdpGwClient {
             udp_mtu,
             max_connections,
             udp_timeout,
-            udpgw_bind_addr,
+            server_addr,
             keepalive_time,
             keepalive_packet,
             server_connections,
@@ -269,8 +269,8 @@ impl UdpGwClient {
         }
     }
 
-    pub(crate) fn get_udpgw_bind_addr(&self) -> SocketAddr {
-        self.udpgw_bind_addr
+    pub(crate) fn get_server_addr(&self) -> SocketAddr {
+        self.server_addr
     }
 
     /// Heartbeat task asynchronous function to periodically check and maintain the active state of the server connection.