diff --git a/.github/labeler.yml b/.github/labeler.yml
index c5d0db312..c162f6aff 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -8,8 +8,8 @@
 - 'src/cpp/src/tokenizers_path.hpp'
 - 'src/cpp/src/circular_buffer_queue.hpp'
 - 'src/cpp/src/synchronized_queue.hpp'
-- 'src/cpp/src/make_combine_segments_stateful.cpp'
-- 'src/cpp/src/make_combine_segments_stateful.hpp'
+- 'src/cpp/src/make_tokenizer_stateful.cpp'
+- 'src/cpp/src/make_tokenizer_stateful.hpp'
 - 'src/python/py_tokenizer.cpp'
 - 'thirdparty/openvino_tokenizers'
 - 'tests/python_tests/tokenizer_configs.py'
diff --git a/src/cpp/src/make_combine_segments_stateful.cpp b/src/cpp/src/make_tokenizer_stateful.cpp
similarity index 98%
rename from src/cpp/src/make_combine_segments_stateful.cpp
rename to src/cpp/src/make_tokenizer_stateful.cpp
index 26c58b8fc..538a935e5 100644
--- a/src/cpp/src/make_combine_segments_stateful.cpp
+++ b/src/cpp/src/make_tokenizer_stateful.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2023-2024 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-#include "make_combine_segments_stateful.hpp"
+#include "make_tokenizer_stateful.hpp"
 #include "openvino/op/constant.hpp"
 #include "openvino/op/select.hpp"
 #include "openvino/op/slice.hpp"
diff --git a/src/cpp/src/make_combine_segments_stateful.hpp b/src/cpp/src/make_tokenizer_stateful.hpp
similarity index 100%
rename from src/cpp/src/make_combine_segments_stateful.hpp
rename to src/cpp/src/make_tokenizer_stateful.hpp
diff --git a/src/cpp/src/tokenizer.cpp b/src/cpp/src/tokenizer.cpp
index 78b94915d..355970c8b 100644
--- a/src/cpp/src/tokenizer.cpp
+++ b/src/cpp/src/tokenizer.cpp
@@ -10,12 +10,11 @@
 #include <jinja2cpp/generic_list.h>
 #include <jinja2cpp/generic_list_iterator.h>
 
-#include "openvino/pass/visualize_tree.hpp"
 #include "openvino/pass/manager.hpp"
 #include "openvino/runtime/core.hpp"
 #include "openvino/genai/tokenizer.hpp"
 
-#include "make_combine_segments_stateful.hpp"
+#include "make_tokenizer_stateful.hpp"
 #include "tokenizers_path.hpp"
 #include "circular_buffer_queue.hpp"
 #include "json_utils.hpp"