diff --git a/onert-micro/onert-micro/src/execute/kernels/Abs.cpp b/onert-micro/onert-micro/src/execute/kernels/Abs.cpp
index 4d861061fc3..f8376b41af8 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Abs.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Abs.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleAbs(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleAbs(const OMExecuteArgs &execute_args)
 {
   auto abs_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -31,3 +36,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAbs(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, abs_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Add.cpp b/onert-micro/onert-micro/src/execute/kernels/Add.cpp
index b8ee5502afa..a95f5a65094 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Add.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Add.cpp
@@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 // NOTE: doesnt currently support dynamic shapes
 // TODO: reduce code duplication with Mul, Sub
-OMStatus onert_micro::execute::execute_kernel_CircleAdd(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleAdd(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -204,3 +209,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAdd(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/AddN.cpp b/onert-micro/onert-micro/src/execute/kernels/AddN.cpp
index 5ab32415b01..11481ca50d2 100644
--- a/onert-micro/onert-micro/src/execute/kernels/AddN.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/AddN.cpp
@@ -29,7 +29,12 @@ namespace
 constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleAddN(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleAddN(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -72,3 +77,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAddN(const OMExecuteArgs &ex
   }
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp
index eb82073a0b2..2df6c3f8982 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp
@@ -29,7 +29,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_arg_common(
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_arg_common(
   const OMExecuteArgs &execute_args,
   const std::function<OMStatus(const core::OMRuntimeShape &input1_shape, const float *input1_data,
                                const int *input2_data, const core::OMRuntimeShape &output_shape,
@@ -92,3 +97,6 @@ OMStatus onert_micro::execute::execute_arg_common(
   }
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ArgMax.cpp b/onert-micro/onert-micro/src/execute/kernels/ArgMax.cpp
index dcf08bed5ef..26e4015c253 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ArgMax.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ArgMax.cpp
@@ -20,7 +20,12 @@
 using namespace onert_micro;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleArgMax(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleArgMax(const OMExecuteArgs &execute_args)
 {
   auto arg_max_float_lambda = [](const core::OMRuntimeShape &input1_shape, const float *input1_data,
                                  const int *input2_data, const core::OMRuntimeShape &output_shape,
@@ -31,3 +36,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleArgMax(const OMExecuteArgs &
 
   return execute_arg_common(execute_args, arg_max_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ArgMin.cpp b/onert-micro/onert-micro/src/execute/kernels/ArgMin.cpp
index a4afc72ee99..e07e4b613df 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ArgMin.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ArgMin.cpp
@@ -20,7 +20,12 @@
 using namespace onert_micro;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleArgMin(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleArgMin(const OMExecuteArgs &execute_args)
 {
   auto arg_max_float_lambda = [](const core::OMRuntimeShape &input1_shape, const float *input1_data,
                                  const int *input2_data, const core::OMRuntimeShape &output_shape,
@@ -31,3 +36,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleArgMin(const OMExecuteArgs &
 
   return execute_arg_common(execute_args, arg_max_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/AveragePool2D.cpp b/onert-micro/onert-micro/src/execute/kernels/AveragePool2D.cpp
index 671b0057e73..ec52f20c7f6 100644
--- a/onert-micro/onert-micro/src/execute/kernels/AveragePool2D.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/AveragePool2D.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleAveragePool2D(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleAveragePool2D(const OMExecuteArgs &execute_args)
 {
   auto avg_pool_float_lambda = [](const core::Pool2DParams &params,
                                   const core::OMRuntimeShape &input_shape, const float *input_data,
@@ -44,3 +49,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAveragePool2D(const OMExecut
 
   return execute_pooling_common(execute_args, avg_pool_float_lambda, avg_pool_int8_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/BatchToSpaceND.cpp b/onert-micro/onert-micro/src/execute/kernels/BatchToSpaceND.cpp
index c54a547f668..abe0f4a7cfb 100644
--- a/onert-micro/onert-micro/src/execute/kernels/BatchToSpaceND.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/BatchToSpaceND.cpp
@@ -20,8 +20,13 @@
 using namespace onert_micro;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleBatchToSpaceND(
-  const onert_micro::execute::OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus
+execute_kernel_CircleBatchToSpaceND(const onert_micro::execute::OMExecuteArgs &execute_args)
 {
   auto batch_to_space_float_lambda =
     [](const core::OMRuntimeShape &input1_shape, const float *input1_data,
@@ -34,3 +39,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleBatchToSpaceND(
 
   return execute_spaces_batches_nd_common(execute_args, batch_to_space_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Cast.cpp b/onert-micro/onert-micro/src/execute/kernels/Cast.cpp
index becfa24e52b..1d7e7c4ab63 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Cast.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Cast.cpp
@@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleCast(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleCast(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -98,3 +103,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleCast(const OMExecuteArgs &ex
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Ceil.cpp b/onert-micro/onert-micro/src/execute/kernels/Ceil.cpp
index c416a38d98a..1e7203bf09e 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Ceil.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Ceil.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleCeil(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleCeil(const OMExecuteArgs &execute_args)
 {
   auto ceil_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                               const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleCeil(const OMExecuteArgs &ex
 
   return execute_math_common(execute_args, ceil_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Concatenation.cpp b/onert-micro/onert-micro/src/execute/kernels/Concatenation.cpp
index b4ed31ec999..7cf8243af1d 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Concatenation.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Concatenation.cpp
@@ -73,7 +73,12 @@ template <typename T> OMStatus evalGeneric(OMRuntimeKernel &runtime_kernel)
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleConcatenation(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleConcatenation(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -115,3 +120,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleConcatenation(const OMExecut
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp b/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp
index 63a4f3f22f0..cde385ab451 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp
@@ -42,7 +42,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesn't currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleConv2D(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleConv2D(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -174,3 +179,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleConv2D(const OMExecuteArgs &
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp
index b670ed1e088..7c0b678b4f6 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp
@@ -20,11 +20,14 @@
 using namespace onert_micro;
 using namespace onert_micro::core;
 
-OMStatus onert_micro::execute::createConvParams(core::ConvQuant &params,
-                                                const circle::Tensor *input,
-                                                const circle::Tensor *filter,
-                                                const circle::Tensor *output,
-                                                circle::ActivationFunctionType act_type)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus createConvParams(core::ConvQuant &params, const circle::Tensor *input,
+                          const circle::Tensor *filter, const circle::Tensor *output,
+                          circle::ActivationFunctionType act_type)
 {
   assert(input->quantization() != nullptr);  // Fix caller
   assert(filter->quantization() != nullptr); // Fix caller
@@ -93,3 +96,6 @@ OMStatus onert_micro::execute::createConvParams(core::ConvQuant &params,
 
   return Ok;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Cos.cpp b/onert-micro/onert-micro/src/execute/kernels/Cos.cpp
index ac14f8e7f8b..6b36034c511 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Cos.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Cos.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleCos(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleCos(const OMExecuteArgs &execute_args)
 {
   auto cos_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleCos(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, cos_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp b/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp
index 23c6e9dea3f..e6fea15c869 100644
--- a/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp
@@ -41,9 +41,13 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
+namespace onert_micro
+{
+namespace execute
+{
+
 // NOTE: doesn't currently support dynamic shapes
-OMStatus
-onert_micro::execute::execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs &execute_args)
+OMStatus execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -180,3 +184,6 @@ onert_micro::execute::execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs &
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp b/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp
index 5a44d635980..03a1d183282 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp
@@ -35,7 +35,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleDequantize(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleDequantize(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -77,3 +82,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleDequantize(const OMExecuteAr
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Div.cpp b/onert-micro/onert-micro/src/execute/kernels/Div.cpp
index 03958782a66..323ac43deca 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Div.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Div.cpp
@@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 // NOTE: doesnt currently support dynamic shapes
 // TODO: reduce code duplication with Add, Sub
-OMStatus onert_micro::execute::execute_kernel_CircleDiv(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleDiv(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -164,3 +169,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleDiv(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Elu.cpp b/onert-micro/onert-micro/src/execute/kernels/Elu.cpp
index 6501950a2aa..bcd57827a7d 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Elu.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Elu.cpp
@@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleElu(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleElu(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -95,3 +100,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleElu(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Equal.cpp b/onert-micro/onert-micro/src/execute/kernels/Equal.cpp
index 4c7a6177176..874012919b4 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Equal.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Equal.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleEqual(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleEqual(const OMExecuteArgs &execute_args)
 {
   OMStatus status = Ok;
 
@@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleEqual(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Exp.cpp b/onert-micro/onert-micro/src/execute/kernels/Exp.cpp
index cc9d319dc3d..3f4e1fc6182 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Exp.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Exp.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleExp(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleExp(const OMExecuteArgs &execute_args)
 {
   auto exp_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleExp(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, exp_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp b/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp
index ee52d5bb50c..cc7aa21f697 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp
@@ -20,7 +20,15 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleExpandDims(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleExpandDims(const OMExecuteArgs &execute_args)
 {
   return execute_reshape_common(execute_args);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Fill.cpp b/onert-micro/onert-micro/src/execute/kernels/Fill.cpp
index 89faeccf82c..e43b9a82cb3 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Fill.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Fill.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesn't currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleFill(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleFill(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -101,3 +106,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFill(const OMExecuteArgs &ex
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Floor.cpp b/onert-micro/onert-micro/src/execute/kernels/Floor.cpp
index 7bdd1ddf388..fcb4a3697b8 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Floor.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Floor.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleFloor(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleFloor(const OMExecuteArgs &execute_args)
 {
   auto floor_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                                const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloor(const OMExecuteArgs &e
 
   return execute_math_common(execute_args, floor_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp b/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp
index ccff542e23e..9de7a848b26 100644
--- a/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp
@@ -26,7 +26,12 @@ using namespace onert_micro;
 using namespace onert_micro::core;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleFloorDiv(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleFloorDiv(const OMExecuteArgs &execute_args)
 {
   uint8_t *input_data1;
   uint8_t *input_data2;
@@ -77,3 +82,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloorDiv(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp b/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp
index 73b3c8b95e8..d3ebf5064a5 100644
--- a/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp
@@ -25,7 +25,12 @@ using namespace onert_micro;
 using namespace onert_micro::core;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleFloorMod(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleFloorMod(const OMExecuteArgs &execute_args)
 {
   uint8_t *input_data1;
   uint8_t *input_data2;
@@ -74,3 +79,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloorMod(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp b/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp
index 89d3482a3fc..cd8f0ddc6be 100644
--- a/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp
@@ -89,9 +89,13 @@ void calculateOpDataFullyConnected(const circle::Tensor *input, const circle::Te
 
 } // namespace
 
+namespace onert_micro
+{
+namespace execute
+{
+
 // NOTE: doesnt currently support dynamic shapes
-OMStatus
-onert_micro::execute::execute_kernel_CircleFullyConnected(const OMExecuteArgs &execute_args)
+OMStatus execute_kernel_CircleFullyConnected(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -218,3 +222,6 @@ onert_micro::execute::execute_kernel_CircleFullyConnected(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/GRU.cpp b/onert-micro/onert-micro/src/execute/kernels/GRU.cpp
index 0a86e6c188e..ed78e253d14 100644
--- a/onert-micro/onert-micro/src/execute/kernels/GRU.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/GRU.cpp
@@ -46,7 +46,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleGRU(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleGRU(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -205,3 +210,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGRU(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Gather.cpp b/onert-micro/onert-micro/src/execute/kernels/Gather.cpp
index 5b220ba5444..5c8504c7122 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Gather.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Gather.cpp
@@ -62,7 +62,12 @@ void gather(const InputT *input_data, const CoordsT *coords_data, InputT *output
 } // namespace
 
 // NOTE: doesn't currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleGather(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleGather(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -188,3 +193,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGather(const OMExecuteArgs &
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp b/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp
index e5f3571c828..2915f6650be 100644
--- a/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp
@@ -31,7 +31,12 @@ using namespace onert_micro::core;
 using namespace onert_micro::execute;
 
 // NOTE: doesn't currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleGatherND(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleGatherND(const OMExecuteArgs &execute_args)
 {
 
   uint8_t *input_data;
@@ -68,3 +73,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGatherND(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Greater.cpp b/onert-micro/onert-micro/src/execute/kernels/Greater.cpp
index 82feefc148f..54aecb1a572 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Greater.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Greater.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleGreater(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleGreater(const OMExecuteArgs &execute_args)
 {
   OMStatus status = Ok;
 
@@ -70,3 +75,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGreater(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp
index 70255d919f2..750b8a71bfe 100644
--- a/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleGreaterEqual(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleGreaterEqual(const OMExecuteArgs &execute_args)
 {
   OMStatus status = Ok;
 
@@ -70,3 +75,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGreaterEqual(const OMExecute
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp b/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp
index a0a46c53b75..6fee283a64a 100644
--- a/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleL2Normalize(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleL2Normalize(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -80,3 +85,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleL2Normalize(const OMExecuteA
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp b/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp
index 032652a2fb6..f6ae45d83e3 100644
--- a/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleL2Pool2D(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleL2Pool2D(const OMExecuteArgs &execute_args)
 {
   auto l2_pool_float_lambda = [](const core::Pool2DParams &params,
                                  const core::OMRuntimeShape &input_shape, const float *input_data,
@@ -43,3 +48,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleL2Pool2D(const OMExecuteArgs
 
   return execute_pooling_common(execute_args, l2_pool_float_lambda, l2_pool_int8_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp b/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp
index d2b6467ca52..b2020b5bcb4 100644
--- a/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp
@@ -20,8 +20,16 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleLeakyRelu(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLeakyRelu(const OMExecuteArgs &execute_args)
 {
   bool is_relu_6 = false;
   return execute_relu_common(execute_args, is_relu_6);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Less.cpp b/onert-micro/onert-micro/src/execute/kernels/Less.cpp
index a7a3b2f9d9b..3ed0516eeb4 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Less.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Less.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleLess(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLess(const OMExecuteArgs &execute_args)
 {
   OMStatus status = Ok;
 
@@ -81,3 +86,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLess(const OMExecuteArgs &ex
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp
index a45b0cf3d0c..ae971a38dfe 100644
--- a/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp
@@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleLessEqual(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLessEqual(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -84,3 +89,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLessEqual(const OMExecuteArg
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Log.cpp b/onert-micro/onert-micro/src/execute/kernels/Log.cpp
index 93c862ea6e2..93e95891122 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Log.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Log.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleLog(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLog(const OMExecuteArgs &execute_args)
 {
   auto log_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLog(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, log_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp b/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp
index decec3f3d04..67cda661795 100644
--- a/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleLogSoftmax(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLogSoftmax(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -87,3 +92,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLogSoftmax(const OMExecuteAr
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp b/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp
index a5f93de6edb..4b41843d6fc 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp
@@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleLogistic(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleLogistic(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -96,3 +101,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLogistic(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp
index 0f604dfd13f..22861250209 100644
--- a/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp
@@ -30,10 +30,15 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_math_common(
-  const OMExecuteArgs &execute_args,
-  const std::function<OMStatus(const core::OMRuntimeShape &, const float *,
-                               const core::OMRuntimeShape &, float *)> &f_float)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus
+execute_math_common(const OMExecuteArgs &execute_args,
+                    const std::function<OMStatus(const core::OMRuntimeShape &, const float *,
+                                                 const core::OMRuntimeShape &, float *)> &f_float)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -63,3 +68,6 @@ OMStatus onert_micro::execute::execute_math_common(
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp b/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp
index b27e3fcb659..0873d4792bd 100644
--- a/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleMaxPool2D(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleMaxPool2D(const OMExecuteArgs &execute_args)
 {
   auto max_pool_float_lambda = [](const core::Pool2DParams &params,
                                   const core::OMRuntimeShape &input_shape, const float *input_data,
@@ -44,3 +49,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMaxPool2D(const OMExecuteArg
 
   return execute_pooling_common(execute_args, max_pool_float_lambda, max_pool_int8_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp b/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp
index 73a10b6091f..0eed2583a8e 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp
@@ -25,7 +25,12 @@ using namespace onert_micro;
 using namespace onert_micro::core;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleMaximum(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleMaximum(const OMExecuteArgs &execute_args)
 {
 
   uint8_t *input_data1;
@@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMaximum(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp b/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp
index e5c4e7ce471..2097e557818 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp
@@ -25,7 +25,12 @@ using namespace onert_micro;
 using namespace onert_micro::core;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleMinimum(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleMinimum(const OMExecuteArgs &execute_args)
 {
 
   uint8_t *input_data1;
@@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMinimum(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Mul.cpp b/onert-micro/onert-micro/src/execute/kernels/Mul.cpp
index 089c7b5ee1e..171fe59e325 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Mul.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Mul.cpp
@@ -72,7 +72,12 @@ void calculateQuantParamsForMul(core::ArithmeticQuantParams &params, const circl
 
 // NOTE: doesnt currently support dynamic shapes
 // TODO: reduce code duplication with Add, Sub
-OMStatus onert_micro::execute::execute_kernel_CircleMul(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleMul(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -226,3 +231,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMul(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Neg.cpp b/onert-micro/onert-micro/src/execute/kernels/Neg.cpp
index 53c1b0c7eb5..ad40143722e 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Neg.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Neg.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleNeg(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleNeg(const OMExecuteArgs &execute_args)
 {
   auto neg_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleNeg(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, neg_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp
index b2c8bc97ad2..f332bc22b96 100644
--- a/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleNotEqual(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleNotEqual(const OMExecuteArgs &execute_args)
 {
   OMStatus status = Ok;
 
@@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleNotEqual(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Pack.cpp b/onert-micro/onert-micro/src/execute/kernels/Pack.cpp
index 91db95fa717..8e41bffac79 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Pack.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Pack.cpp
@@ -78,7 +78,12 @@ template <typename T> void packImpl(OMRuntimeKernel &runtime_kernel)
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CirclePack(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CirclePack(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -120,3 +125,6 @@ OMStatus onert_micro::execute::execute_kernel_CirclePack(const OMExecuteArgs &ex
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Pad.cpp b/onert-micro/onert-micro/src/execute/kernels/Pad.cpp
index 586d2e4a372..add29154016 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Pad.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Pad.cpp
@@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CirclePad(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CirclePad(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -126,3 +131,6 @@ OMStatus onert_micro::execute::execute_kernel_CirclePad(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp
index be762b9b9f1..0a97f05f8a5 100644
--- a/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp
@@ -28,7 +28,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_pooling_common(
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_pooling_common(
   const OMExecuteArgs &execute_args,
   const std::function<OMStatus(const core::Pool2DParams &, const core::OMRuntimeShape &,
                                const float *, const core::OMRuntimeShape &, float *)> &f_float,
@@ -135,3 +140,6 @@ OMStatus onert_micro::execute::execute_pooling_common(
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp b/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp
index 9220b781ef0..db202c479be 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp
@@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleQuantize(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleQuantize(const OMExecuteArgs &execute_args)
 {
   const circle::Tensor *input = nullptr;
   const circle::Tensor *output = nullptr;
@@ -79,3 +84,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleQuantize(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp
index 791fc97f16a..03e8377cd51 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp
@@ -29,13 +29,16 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace TensorIndexTISO
 
-OMStatus onert_micro::execute::readKernelDataTISO(const OMExecuteArgs &execute_args,
-                                                  uint8_t *&input_data1, uint8_t *&input_data2,
-                                                  uint8_t *&output_data,
-                                                  core::OMRuntimeShape &input1_shape_ref,
-                                                  core::OMRuntimeShape &input2_shape_ref,
-                                                  core::OMRuntimeShape &output_shape_ref,
-                                                  circle::TensorType &tensor_type)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus readKernelDataTISO(const OMExecuteArgs &execute_args, uint8_t *&input_data1,
+                            uint8_t *&input_data2, uint8_t *&output_data,
+                            core::OMRuntimeShape &input1_shape_ref,
+                            core::OMRuntimeShape &input2_shape_ref,
+                            core::OMRuntimeShape &output_shape_ref, circle::TensorType &tensor_type)
 
 {
 
@@ -76,3 +79,6 @@ OMStatus onert_micro::execute::readKernelDataTISO(const OMExecuteArgs &execute_a
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Relu.cpp b/onert-micro/onert-micro/src/execute/kernels/Relu.cpp
index 2c8fbb923c4..0721ea4886c 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Relu.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Relu.cpp
@@ -20,8 +20,16 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleRelu(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleRelu(const OMExecuteArgs &execute_args)
 {
   bool is_relu_6 = false;
   return execute_relu_common(execute_args, is_relu_6);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp b/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp
index f501ad348bb..f80cd8b1cff 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp
@@ -20,8 +20,16 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleRelu6(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleRelu6(const OMExecuteArgs &execute_args)
 {
   bool is_relu_6 = true;
   return execute_relu_common(execute_args, is_relu_6);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp
index 3393c72e5c9..b450d79d829 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp
@@ -29,8 +29,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_relu_common(const OMExecuteArgs &execute_args,
-                                                   bool is_relu_6)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_relu_common(const OMExecuteArgs &execute_args, bool is_relu_6)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -113,3 +117,6 @@ OMStatus onert_micro::execute::execute_relu_common(const OMExecuteArgs &execute_
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp b/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp
index 5ddc9b050a1..3e9fef4f62e 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp
@@ -28,7 +28,15 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleReshape(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleReshape(const OMExecuteArgs &execute_args)
 {
   return execute_reshape_common(execute_args);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp
index ad15cce6f6a..3c1ab7e7da9 100644
--- a/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp
@@ -28,7 +28,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_reshape_common(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_reshape_common(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -68,3 +73,6 @@ OMStatus onert_micro::execute::execute_reshape_common(const OMExecuteArgs &execu
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Round.cpp b/onert-micro/onert-micro/src/execute/kernels/Round.cpp
index 753d7cceca3..306d7f8bd06 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Round.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Round.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleRound(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleRound(const OMExecuteArgs &execute_args)
 {
   auto round_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                                const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleRound(const OMExecuteArgs &e
 
   return execute_math_common(execute_args, round_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp b/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp
index 3e757b4f0dd..c1deaffeb3c 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleRsqrt(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleRsqrt(const OMExecuteArgs &execute_args)
 {
   auto rsqrt_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                                const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleRsqrt(const OMExecuteArgs &e
 
   return execute_math_common(execute_args, rsqrt_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp b/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp
index d1a7a2e6072..1065ee5afd0 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp
@@ -76,7 +76,12 @@ void prepareQuantParams(core::SVDFQuantParams &params, const circle::Tensor *inp
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleSVDF(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSVDF(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -219,3 +224,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSVDF(const OMExecuteArgs &ex
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Shape.cpp b/onert-micro/onert-micro/src/execute/kernels/Shape.cpp
index 1838a762c32..851815088b2 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Shape.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Shape.cpp
@@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleShape(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleShape(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -73,3 +78,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleShape(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Sin.cpp b/onert-micro/onert-micro/src/execute/kernels/Sin.cpp
index 7134bb087e6..9f01a730424 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Sin.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Sin.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleSin(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSin(const OMExecuteArgs &execute_args)
 {
   auto sin_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                              const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSin(const OMExecuteArgs &exe
 
   return execute_math_common(execute_args, sin_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Slice.cpp b/onert-micro/onert-micro/src/execute/kernels/Slice.cpp
index c675a152fe7..fd90f9c8d62 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Slice.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Slice.cpp
@@ -54,7 +54,12 @@ void getBeginAndSizeVectors(int dimensions, const int32_t *begin_data, const int
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleSlice(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSlice(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -150,3 +155,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSlice(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp b/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp
index 78b750eb703..c94c614dcc5 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp
@@ -49,7 +49,12 @@ void preprocessSoftmaxScaling(double beta, double input_scale, int input_integer
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleSoftmax(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSoftmax(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -162,3 +167,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSoftmax(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp b/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp
index dfa1934e56a..8bd0d0a9ebc 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp
@@ -20,8 +20,13 @@
 using namespace onert_micro;
 using namespace onert_micro::execute;
 
-OMStatus onert_micro::execute::execute_kernel_CircleSpaceToBatchND(
-  const onert_micro::execute::OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus
+execute_kernel_CircleSpaceToBatchND(const onert_micro::execute::OMExecuteArgs &execute_args)
 {
   auto batch_to_space_float_lambda =
     [](const core::OMRuntimeShape &input1_shape, const float *input1_data,
@@ -34,3 +39,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSpaceToBatchND(
 
   return execute_spaces_batches_nd_common(execute_args, batch_to_space_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp b/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp
index 9eef7a22f61..93a9a3b2085 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp
@@ -30,8 +30,12 @@ constexpr uint32_t inputTensorIdx = 0;
 constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
-OMStatus onert_micro::execute::execute_kernel_CircleSpaceToDepth(
-  const onert_micro::execute::OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSpaceToDepth(const onert_micro::execute::OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -95,3 +99,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSpaceToDepth(
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp
index d93c4d06c21..b67d627fe56 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp
@@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_spaces_batches_nd_common(
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_spaces_batches_nd_common(
   const OMExecuteArgs &execute_args,
   const std::function<
     OMStatus(const core::OMRuntimeShape &unextended_input1_shape, const float *input1_data,
@@ -107,3 +112,6 @@ OMStatus onert_micro::execute::execute_spaces_batches_nd_common(
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Split.cpp b/onert-micro/onert-micro/src/execute/kernels/Split.cpp
index 982566b7026..8fd28daba73 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Split.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Split.cpp
@@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleSplit(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSplit(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -113,3 +118,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSplit(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp b/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp
index c3da0afeb35..5f404aaaf60 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp
@@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleSplitV(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSplitV(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -110,3 +115,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSplitV(const OMExecuteArgs &
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp b/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp
index f2fe8b8ac10..a31eb526bc5 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleSqrt(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSqrt(const OMExecuteArgs &execute_args)
 {
   auto sqrt_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                               const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSqrt(const OMExecuteArgs &ex
 
   return execute_math_common(execute_args, sqrt_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Square.cpp b/onert-micro/onert-micro/src/execute/kernels/Square.cpp
index 776552bf2ee..fb9ac450754 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Square.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Square.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleSquare(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSquare(const OMExecuteArgs &execute_args)
 {
   auto square_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                                 const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSquare(const OMExecuteArgs &
 
   return execute_math_common(execute_args, square_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp b/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp
index 6ccb2fafa5c..a332da9d505 100644
--- a/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp
@@ -40,10 +40,14 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
+namespace onert_micro
+{
+namespace execute
+{
+
 // NOTE: doesnt currently support dynamic shapes
 // TODO: reduce code duplication with Add, Mul
-OMStatus
-onert_micro::execute::execute_kernel_CircleSquaredDifference(const OMExecuteArgs &execute_args)
+OMStatus execute_kernel_CircleSquaredDifference(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -122,3 +126,6 @@ onert_micro::execute::execute_kernel_CircleSquaredDifference(const OMExecuteArgs
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp b/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp
index b814586dc6b..c6b0e0a7820 100644
--- a/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp
@@ -66,7 +66,12 @@ core::StridedSliceParams buildStridedSliceParams(int32_t dims, const int32_t *be
 } // namespace
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleStridedSlice(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleStridedSlice(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -161,3 +166,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleStridedSlice(const OMExecute
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Sub.cpp b/onert-micro/onert-micro/src/execute/kernels/Sub.cpp
index 10cfc5a43ce..9d1483bae56 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Sub.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Sub.cpp
@@ -42,7 +42,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 // NOTE: doesnt currently support dynamic shapes
 // TODO: reduce code duplication with Add, Mul
-OMStatus onert_micro::execute::execute_kernel_CircleSub(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleSub(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -194,3 +199,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSub(const OMExecuteArgs &exe
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp b/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp
index 52d4954ac0c..f0a936af7e8 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp
@@ -21,7 +21,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleTanh(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleTanh(const OMExecuteArgs &execute_args)
 {
   auto tanh_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data,
                               const core::OMRuntimeShape &output_shape, float *output_data) {
@@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTanh(const OMExecuteArgs &ex
 
   return execute_math_common(execute_args, tanh_float_lambda);
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp b/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp
index cc11c4f662e..562d05d504d 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp
@@ -37,7 +37,12 @@ constexpr int kOutputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleTranspose(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleTranspose(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -107,3 +112,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTranspose(const OMExecuteArg
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp b/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp
index d780328b8b6..abdfddf6ca1 100644
--- a/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp
@@ -45,7 +45,12 @@ constexpr int kOutputTensorIdx = 0;
 } // namespace
 
 // NOTE: doesn't currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleTransposeConv(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleTransposeConv(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -147,3 +152,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTransposeConv(const OMExecut
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp b/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp
index ecb0b01e721..9ff551ee99a 100644
--- a/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp
@@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0;
 
 } // namespace
 
-OMStatus onert_micro::execute::execute_kernel_CircleUnpack(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleUnpack(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
   core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
@@ -109,3 +114,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleUnpack(const OMExecuteArgs &
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro
diff --git a/onert-micro/onert-micro/src/execute/kernels/While.cpp b/onert-micro/onert-micro/src/execute/kernels/While.cpp
index d59fa82383d..7a68c3aea51 100644
--- a/onert-micro/onert-micro/src/execute/kernels/While.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/While.cpp
@@ -25,7 +25,12 @@ using namespace onert_micro;
 using namespace onert_micro::execute;
 
 // NOTE: doesnt currently support dynamic shapes
-OMStatus onert_micro::execute::execute_kernel_CircleWhile(const OMExecuteArgs &execute_args)
+namespace onert_micro
+{
+namespace execute
+{
+
+OMStatus execute_kernel_CircleWhile(const OMExecuteArgs &execute_args)
 {
   core::OMRuntimeModule &runtime_module = execute_args.runtime_module;
   core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
@@ -144,3 +149,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleWhile(const OMExecuteArgs &e
 
   return status;
 }
+
+} // namespace execute
+} // namespace onert_micro