diff --git a/apps/nccl/src/allreduce.hpp b/apps/nccl/src/allreduce.hpp
index 7f9c5f245..4194cb19f 100644
--- a/apps/nccl/src/allreduce.hpp
+++ b/apps/nccl/src/allreduce.hpp
@@ -13,8 +13,8 @@
 #include <mscclpp/gpu_data_types.hpp>
 #include <mscclpp/memory_channel.hpp>
 #include <mscclpp/memory_channel_device.hpp>
-#include <mscclpp/nvls.hpp>
 #include <mscclpp/packet_device.hpp>
+#include <mscclpp/switch_channel.hpp>
 #include <type_traits>
 
 #if defined(ENABLE_NPKIT)
diff --git a/apps/nccl/src/common.cu b/apps/nccl/src/common.cu
index c8d14aa84..b1d258dbb 100644
--- a/apps/nccl/src/common.cu
+++ b/apps/nccl/src/common.cu
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <mscclpp/core.hpp>
 #include <mscclpp/memory_channel.hpp>
-#include <mscclpp/nvls.hpp>
+#include <mscclpp/switch_channel.hpp>
 
 #include "common.hpp"
 
@@ -98,8 +98,8 @@ std::vector<mscclpp::SwitchChannel> setupNvlsChannels(std::vector<std::shared_pt
 
   for (int idx = 0; idx < nSwitchChannels; ++idx) {
     std::shared_ptr<mscclpp::NvlsConnection> nvlsConnection = conns[idx];
-    mscclpp::SwitchChannel SwitchChannel = nvlsConnection->bindAllocatedMemory((CUdeviceptr)buffer, bufferSize);
-    channels.push_back(SwitchChannel);
+    mscclpp::SwitchChannel switchChannel = nvlsConnection->bindAllocatedMemory((CUdeviceptr)buffer, bufferSize);
+    channels.push_back(switchChannel);
   }
   return channels;
 }
diff --git a/apps/nccl/src/common.hpp b/apps/nccl/src/common.hpp
index 06eaaf7ff..455914384 100644
--- a/apps/nccl/src/common.hpp
+++ b/apps/nccl/src/common.hpp
@@ -8,7 +8,7 @@
 #include <mscclpp/core.hpp>
 #include <mscclpp/env.hpp>
 #include <mscclpp/memory_channel.hpp>
-#include <mscclpp/nvls.hpp>
+#include <mscclpp/switch_channel.hpp>
 #include <vector>
 
 #if defined(__HIP_PLATFORM_AMD__)
diff --git a/apps/nccl/src/nccl.cu b/apps/nccl/src/nccl.cu
index 7e1c605ad..4ec8a1785 100644
--- a/apps/nccl/src/nccl.cu
+++ b/apps/nccl/src/nccl.cu
@@ -4,16 +4,10 @@
 #include <algorithm>
 #include <filesystem>
 #include <functional>
-#include <mscclpp/concurrency_device.hpp>
 #include <mscclpp/core.hpp>
 #include <mscclpp/env.hpp>
 #include <mscclpp/executor.hpp>
-#include <mscclpp/memory_channel.hpp>
-#include <mscclpp/memory_channel_device.hpp>
-#include <mscclpp/nvls.hpp>
 #include <mscclpp/utils.hpp>
-#include <queue>
-#include <sstream>
 #include <unordered_map>
 #include <vector>
 #if defined(ENABLE_NPKIT)
diff --git a/include/mscclpp/algorithm.hpp b/include/mscclpp/algorithm.hpp
index e815d72bc..34e10f8f9 100644
--- a/include/mscclpp/algorithm.hpp
+++ b/include/mscclpp/algorithm.hpp
@@ -6,8 +6,8 @@
 
 #include <memory>
 #include <mscclpp/memory_channel.hpp>
-#include <mscclpp/nvls.hpp>
 #include <mscclpp/port_channel.hpp>
+#include <mscclpp/switch_channel.hpp>
 #include <vector>
 
 namespace mscclpp {
diff --git a/include/mscclpp/nvls.hpp b/include/mscclpp/switch_channel.hpp
similarity index 95%
rename from include/mscclpp/nvls.hpp
rename to include/mscclpp/switch_channel.hpp
index 1740e0335..2dd3cad3e 100644
--- a/include/mscclpp/nvls.hpp
+++ b/include/mscclpp/switch_channel.hpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#ifndef MSCCLPP_NVLS_HPP_
-#define MSCCLPP_NVLS_HPP_
+#ifndef MSCCLPP_SWITCH_CHANNEL_HPP_
+#define MSCCLPP_SWITCH_CHANNEL_HPP_
 
 #include <mscclpp/gpu_utils.hpp>
 #include <mscclpp/switch_channel_device.hpp>
@@ -68,4 +68,4 @@ std::shared_ptr<NvlsConnection> connectNvlsCollective(std::shared_ptr<Communicat
 
 }  // namespace mscclpp
 
-#endif  // MSCCLPP_NVLS_HPP_
+#endif  // MSCCLPP_SWITCH_CHANNEL_HPP_
diff --git a/python/mscclpp/nvls_py.cpp b/python/mscclpp/switch_channel_py.cpp
similarity index 97%
rename from python/mscclpp/nvls_py.cpp
rename to python/mscclpp/switch_channel_py.cpp
index 78cedefbc..3bb50f56d 100644
--- a/python/mscclpp/nvls_py.cpp
+++ b/python/mscclpp/switch_channel_py.cpp
@@ -9,7 +9,7 @@
 #include <nanobind/stl/vector.h>
 
 #include <mscclpp/core.hpp>
-#include <mscclpp/nvls.hpp>
+#include <mscclpp/switch_channel.hpp>
 
 namespace nb = nanobind;
 using namespace mscclpp;
diff --git a/src/executor/executor.cc b/src/executor/executor.cc
index b897cea44..8afc431e6 100644
--- a/src/executor/executor.cc
+++ b/src/executor/executor.cc
@@ -3,9 +3,8 @@
 
 #include <mscclpp/executor.hpp>
 #include <mscclpp/memory_channel.hpp>
-#include <mscclpp/nvls.hpp>
 #include <mscclpp/port_channel.hpp>
-#include <set>
+#include <mscclpp/switch_channel.hpp>
 
 #include "debug.h"
 #include "execution_kernel.hpp"
diff --git a/src/include/execution_common.hpp b/src/include/execution_common.hpp
index 0b462811e..1d277a158 100644
--- a/src/include/execution_common.hpp
+++ b/src/include/execution_common.hpp
@@ -5,8 +5,8 @@
 #define MSCCLPP_EXECUTION_COMMON_HPP_
 
 #include <mscclpp/memory_channel.hpp>
-#include <mscclpp/nvls.hpp>
 #include <mscclpp/port_channel.hpp>
+#include <mscclpp/switch_channel.hpp>
 
 namespace mscclpp {
 
diff --git a/src/nvls.cc b/src/switch_channel.cc
similarity index 99%
rename from src/nvls.cc
rename to src/switch_channel.cc
index cb01e541b..dbfb0cf8b 100644
--- a/src/nvls.cc
+++ b/src/switch_channel.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 #include <mscclpp/core.hpp>
-#include <mscclpp/nvls.hpp>
+#include <mscclpp/switch_channel.hpp>
 #include <mscclpp/utils.hpp>
 
 #include "api.h"
diff --git a/test/mp_unit/switch_channel_tests.cu b/test/mp_unit/switch_channel_tests.cu
index da4cc9c22..44f4ebedd 100644
--- a/test/mp_unit/switch_channel_tests.cu
+++ b/test/mp_unit/switch_channel_tests.cu
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 #include <algorithm>
-#include <mscclpp/nvls.hpp>
+#include <mscclpp/switch_channel.hpp>
 #include <mscclpp/switch_channel_device.hpp>
 
 #include "mp_unit_tests.hpp"