diff --git a/runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc b/runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc
index 7a997b95378..fc59b517756 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc
+++ b/runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc
@@ -23,13 +23,7 @@
 #include <cstring>
 #include <iostream>
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 // FIXME: Using higher level API instead of raw API
@@ -170,7 +164,4 @@ size_t BulkPipelineBuffer::getAlignedSize(size_t size) const
   return (size + _4KB_M_1) & ~_4KB_M_1;
 }
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
diff --git a/runtime/onert/backend/trix/ops/BulkPipelineBuffer.h b/runtime/onert/backend/trix/ops/BulkPipelineBuffer.h
index 30314e4b544..7170dc91cc1 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineBuffer.h
+++ b/runtime/onert/backend/trix/ops/BulkPipelineBuffer.h
@@ -14,21 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
-#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
+#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
+#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
 
 #include <memory>
 #include <cstdio>
 #include <stdexcept>
 #include <libnpuhost.h>
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 class BulkPipelineBuffer
@@ -70,9 +64,6 @@ class BulkPipelineBuffer
   generic_buffer *_buffer{nullptr};
 };
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
 
-#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
+#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
diff --git a/runtime/onert/backend/trix/ops/BulkPipelineManager.cc b/runtime/onert/backend/trix/ops/BulkPipelineManager.cc
index 1109a24c55f..13a712a3c63 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineManager.cc
+++ b/runtime/onert/backend/trix/ops/BulkPipelineManager.cc
@@ -22,13 +22,7 @@
 #include <thread>
 #include <chrono>
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 BulkPipelineManager::BulkPipelineManager(const PipelineConfig &config) : _config(config)
@@ -169,7 +163,4 @@ void BulkPipelineManager::prepareModels()
   }
 }
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
diff --git a/runtime/onert/backend/trix/ops/BulkPipelineManager.h b/runtime/onert/backend/trix/ops/BulkPipelineManager.h
index 8f82c2e93a3..04af5dd5255 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineManager.h
+++ b/runtime/onert/backend/trix/ops/BulkPipelineManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
-#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
+#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
+#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
 
 #include <memory>
 #include <vector>
@@ -27,13 +27,7 @@
 #include <backend/IPortableTensor.h>
 #include "BulkPipelineModel.h"
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 class BulkPipelineManager
@@ -72,9 +66,6 @@ class BulkPipelineManager
   std::vector<std::shared_ptr<BulkPipelineModel>> _models;
 };
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
 
-#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
+#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
diff --git a/runtime/onert/backend/trix/ops/BulkPipelineModel.cc b/runtime/onert/backend/trix/ops/BulkPipelineModel.cc
index ce7674c2cbf..91b2d5ea1c3 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineModel.cc
+++ b/runtime/onert/backend/trix/ops/BulkPipelineModel.cc
@@ -20,13 +20,7 @@
 #include <cstring>
 #include <algorithm>
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 BulkPipelineModel::BulkPipelineModel(const std::string &model_path, int device_id)
@@ -275,7 +269,4 @@ void BulkPipelineModel::closeDevice()
   }
 }
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
diff --git a/runtime/onert/backend/trix/ops/BulkPipelineModel.h b/runtime/onert/backend/trix/ops/BulkPipelineModel.h
index d39a49c0a3e..a3f9474429d 100644
--- a/runtime/onert/backend/trix/ops/BulkPipelineModel.h
+++ b/runtime/onert/backend/trix/ops/BulkPipelineModel.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
-#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
+#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__
+#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__
 
 #include <memory>
 #include <string>
@@ -29,13 +29,7 @@
 
 #include "BulkPipelineBuffer.h"
 
-namespace onert
-{
-namespace backend
-{
-namespace trix
-{
-namespace ops
+namespace onert::backend::trix::ops
 {
 
 class BulkPipelineModel
@@ -96,9 +90,6 @@ class BulkPipelineModel
   std::atomic<bool> _buffer_ready{false};
 };
 
-} // namespace ops
-} // namespace trix
-} // namespace backend
-} // namespace onert
+} // namespace onert::backend::trix::ops
 
-#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
+#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__