diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05def0b..58b9aa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,8 @@ cmake_minimum_required(VERSION 3.31.8)
 
 project(tritontensorrtbackend LANGUAGES C CXX)
 
-# Use C++17 standard as Triton's minimum required.
-set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard which features are requested to build this target.")
+# Use C++20 standard as Triton's minimum required.
+set(TRITON_MIN_CXX_STANDARD 20 CACHE STRING "The minimum C++ standard which features are requested to build this target.")
 
 #
 # Options
@@ -131,9 +131,9 @@ add_library(
   src/shape_tensor.h
   src/tensorrt_utils.cc
   src/tensorrt_utils.h
-  src/filesystem.h
-  src/filesystem.cc
-  src/semaphore.h
+  src/triton_filesystem.h
+  src/triton_filesystem.cc
+  src/triton_semaphore.h
   src/shared_library.h
   src/shared_library.cc
   src/loader.cc
diff --git a/src/instance_state.h b/src/instance_state.h
index 7e50c75..63ae4ee 100644
--- a/src/instance_state.h
+++ b/src/instance_state.h
@@ -34,11 +34,11 @@
 
 #include "io_binding_info.h"
 #include "model_state.h"
-#include "semaphore.h"
 #include "shape_tensor.h"
 #include "tensorrt_model_instance.h"
 #include "triton/backend/backend_input_collector.h"
 #include "triton/backend/backend_output_responder.h"
+#include "triton_semaphore.h"
 
 namespace triton { namespace backend { namespace tensorrt {
 
diff --git a/src/model_state.h b/src/model_state.h
index 243edc8..bdf2b31 100644
--- a/src/model_state.h
+++ b/src/model_state.h
@@ -29,9 +29,9 @@
 #include <NvInfer.h>
 
 #include "logging.h"
-#include "semaphore.h"
 #include "tensorrt_model.h"
 #include "tensorrt_model_instance.h"
+#include "triton_semaphore.h"
 
 namespace triton { namespace backend { namespace tensorrt {
 
diff --git a/src/shared_library.cc b/src/shared_library.cc
index d4c762c..5faa656 100644
--- a/src/shared_library.cc
+++ b/src/shared_library.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2022-2026, NVIDIA CORPORATION. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -26,9 +26,9 @@
 
 #include "shared_library.h"
 
-#include "filesystem.h"
 #include "logging.h"
 #include "mutex"
+#include "triton_filesystem.h"
 
 /// FIXME: Duplication of core/src/shared_library.cc
 /// Separate shared_library to common library and delete this
diff --git a/src/filesystem.cc b/src/triton_filesystem.cc
similarity index 97%
rename from src/filesystem.cc
rename to src/triton_filesystem.cc
index 4eb22ab..565bfbf 100644
--- a/src/filesystem.cc
+++ b/src/triton_filesystem.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2022-2026, NVIDIA CORPORATION. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
diff --git a/src/filesystem.h b/src/triton_filesystem.h
similarity index 96%
rename from src/filesystem.h
rename to src/triton_filesystem.h
index 678a4b4..5f97127 100644
--- a/src/filesystem.h
+++ b/src/triton_filesystem.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2022-2026, NVIDIA CORPORATION. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
diff --git a/src/semaphore.h b/src/triton_semaphore.h
similarity index 96%
rename from src/semaphore.h
rename to src/triton_semaphore.h
index 89c99b9..c50d696 100644
--- a/src/semaphore.h
+++ b/src/triton_semaphore.h
@@ -1,4 +1,4 @@
-// Copyright 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright 2021-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions