12 files changed, 63 insertions, 63 deletions
diff --git a/arm_compute/core/CL/CLKernels.h b/arm_compute/core/CL/CLKernels.h
index 1ffbad90cf..9da0e5ab3a 100644
--- a/arm_compute/core/CL/CLKernels.h
+++ b/arm_compute/core/CL/CLKernels.h
@@ -42,9 +42,9 @@
 #include "arm_compute/core/CL/kernels/CLCol2ImKernel.h"
 #include "arm_compute/core/CL/kernels/CLColorConvertKernel.h"
 #include "arm_compute/core/CL/kernels/CLConvolutionKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthConvertKernel.h"
-#include "arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h"
+#include "arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h"
 #include "arm_compute/core/CL/kernels/CLDepthwiseIm2ColKernel.h"
 #include "arm_compute/core/CL/kernels/CLDepthwiseVectorToTensorKernel.h"
 #include "arm_compute/core/CL/kernels/CLDepthwiseWeightsReshapeKernel.h"
@@ -76,7 +76,7 @@
 #include "arm_compute/core/CL/kernels/CLHistogramKernel.h"
 #include "arm_compute/core/CL/kernels/CLIm2ColKernel.h"
 #include "arm_compute/core/CL/kernels/CLIntegralImageKernel.h"
-#include "arm_compute/core/CL/kernels/CLL2NormalizeKernel.h"
+#include "arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h"
 #include "arm_compute/core/CL/kernels/CLLKTrackerKernel.h"
 #include "arm_compute/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.h"
 #include "arm_compute/core/CL/kernels/CLMagnitudePhaseKernel.h"
diff --git a/arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h
index 2833d8ec23..467bdfab3b 100644
--- a/arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h
@@ -35,21 +35,21 @@ class ICLTensor;
 /** Interface for the depth concatenate kernel.
  *  The input tensor will be concatenated into the output tensor.
  */
-class CLDepthConcatenateKernel : public ICLKernel
+class CLDepthConcatenateLayerKernel : public ICLKernel
 {
 public:
     /** Default constructor */
-    CLDepthConcatenateKernel();
+    CLDepthConcatenateLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLDepthConcatenateKernel(const CLDepthConcatenateKernel &) = delete;
+    CLDepthConcatenateLayerKernel(const CLDepthConcatenateLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLDepthConcatenateKernel &operator=(const CLDepthConcatenateKernel &) = delete;
+    CLDepthConcatenateLayerKernel &operator=(const CLDepthConcatenateLayerKernel &) = delete;
     /** Allow instances of this class to be moved */
-    CLDepthConcatenateKernel(CLDepthConcatenateKernel &&) = default;
+    CLDepthConcatenateLayerKernel(CLDepthConcatenateLayerKernel &&) = default;
     /** Allow instances of this class to be moved */
-    CLDepthConcatenateKernel &operator=(CLDepthConcatenateKernel &&) = default;
+    CLDepthConcatenateLayerKernel &operator=(CLDepthConcatenateLayerKernel &&) = default;
     /** Default destructor */
-    ~CLDepthConcatenateKernel() = default;
+    ~CLDepthConcatenateLayerKernel() = default;
     /** Initialise the kernel's inputs and output
      *
      * @param[in]     input        Input tensor. Data types supported: QS8/QS16/F16/F32.
diff --git a/arm_compute/core/CL/kernels/CLDepthConvertKernel.h b/arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h
index da70bff0fd..3a6310d69e 100644
--- a/arm_compute/core/CL/kernels/CLDepthConvertKernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h
@@ -36,7 +36,7 @@ class ICLTensor;
 /** Interface for the depth conversion kernel.
  *
  */
-class CLDepthConvertKernel : public ICLSimple2DKernel
+class CLDepthConvertLayerKernel : public ICLSimple2DKernel
 {
 public:
     /** Set the input and output of the kernel.
diff --git a/arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h b/arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h
index f9689a4329..eb62465f84 100644
--- a/arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h
+++ b/arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h
@@ -32,19 +32,19 @@ class ICLTensor;
 
 /** Interface for the kernel to run a 3x3 depthwise convolution on a tensor.
  */
-class CLDepthwiseConvolution3x3Kernel : public ICLKernel
+class CLDepthwiseConvolutionLayer3x3Kernel : public ICLKernel
 {
 public:
     /** Default constructor */
-    CLDepthwiseConvolution3x3Kernel();
+    CLDepthwiseConvolutionLayer3x3Kernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLDepthwiseConvolution3x3Kernel(const CLDepthwiseConvolution3x3Kernel &) = delete;
+    CLDepthwiseConvolutionLayer3x3Kernel(const CLDepthwiseConvolutionLayer3x3Kernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLDepthwiseConvolution3x3Kernel &operator=(const CLDepthwiseConvolution3x3Kernel &) = delete;
+    CLDepthwiseConvolutionLayer3x3Kernel &operator=(const CLDepthwiseConvolutionLayer3x3Kernel &) = delete;
     /** Default Move Constructor. */
-    CLDepthwiseConvolution3x3Kernel(CLDepthwiseConvolution3x3Kernel &&) = default;
+    CLDepthwiseConvolutionLayer3x3Kernel(CLDepthwiseConvolutionLayer3x3Kernel &&) = default;
     /** Default move assignment operator. */
-    CLDepthwiseConvolution3x3Kernel &operator=(CLDepthwiseConvolution3x3Kernel &&) = default;
+    CLDepthwiseConvolutionLayer3x3Kernel &operator=(CLDepthwiseConvolutionLayer3x3Kernel &&) = default;
     /** Initialize the function's source, destination, conv and border_size.
      *
      * @param[in]  input     Source tensor. DataType supported: QASYMM8/F32.
diff --git a/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h b/arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h
index 2056b4e615..f7d717119b 100644
--- a/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h
+++ b/arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h
@@ -32,21 +32,21 @@ namespace arm_compute
 class ICLTensor;
 
 /** Interface for the reduction operation kernel */
-class CLL2NormalizeKernel : public ICLKernel
+class CLL2NormalizeLayerKernel : public ICLKernel
 {
 public:
     /** Default constructor */
-    CLL2NormalizeKernel();
+    CLL2NormalizeLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLL2NormalizeKernel(const CLL2NormalizeKernel &) = delete;
+    CLL2NormalizeLayerKernel(const CLL2NormalizeLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    CLL2NormalizeKernel &operator=(const CLL2NormalizeKernel &) = delete;
+    CLL2NormalizeLayerKernel &operator=(const CLL2NormalizeLayerKernel &) = delete;
     /** Allow instances of this class to be moved */
-    CLL2NormalizeKernel(CLL2NormalizeKernel &&) = default;
+    CLL2NormalizeLayerKernel(CLL2NormalizeLayerKernel &&) = default;
     /** Allow instances of this class to be moved */
-    CLL2NormalizeKernel &operator=(CLL2NormalizeKernel &&) = default;
+    CLL2NormalizeLayerKernel &operator=(CLL2NormalizeLayerKernel &&) = default;
     /** Default destructor */
-    ~CLL2NormalizeKernel() = default;
+    ~CLL2NormalizeLayerKernel() = default;
 
     /** Set the input and output tensors.
      *
diff --git a/arm_compute/core/GLES_COMPUTE/GCKernels.h b/arm_compute/core/GLES_COMPUTE/GCKernels.h
index 57d11d5f18..9831e25299 100644
--- a/arm_compute/core/GLES_COMPUTE/GCKernels.h
+++ b/arm_compute/core/GLES_COMPUTE/GCKernels.h
@@ -29,7 +29,7 @@
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.h"
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCBatchNormalizationLayerKernel.h"
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCCol2ImKernel.h"
-#include "arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.h"
+#include "arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h"
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.h"
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCDropoutKernel.h"
 #include "arm_compute/core/GLES_COMPUTE/kernels/GCFillBorderKernel.h"
diff --git a/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.h b/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h
index 9a34a9a9c5..ce220cc564 100644
--- a/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.h
+++ b/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h
@@ -35,21 +35,21 @@ class IGCTensor;
 /** Interface for the depth concatenate kernel.
  *  The input tensor will be concatenated into the output tensor.
  */
-class GCDepthConcatenateKernel : public IGCKernel
+class GCDepthConcatenateLayerKernel : public IGCKernel
 {
 public:
     /** Default constructor */
-    GCDepthConcatenateKernel();
+    GCDepthConcatenateLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    GCDepthConcatenateKernel(const GCDepthConcatenateKernel &) = delete;
+    GCDepthConcatenateLayerKernel(const GCDepthConcatenateLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    GCDepthConcatenateKernel &operator=(const GCDepthConcatenateKernel &) = delete;
+    GCDepthConcatenateLayerKernel &operator=(const GCDepthConcatenateLayerKernel &) = delete;
     /** Allow instances of this class to be moved */
-    GCDepthConcatenateKernel(GCDepthConcatenateKernel &&) = default;
+    GCDepthConcatenateLayerKernel(GCDepthConcatenateLayerKernel &&) = default;
     /** Allow instances of this class to be moved */
-    GCDepthConcatenateKernel &operator=(GCDepthConcatenateKernel &&) = default;
+    GCDepthConcatenateLayerKernel &operator=(GCDepthConcatenateLayerKernel &&) = default;
     /** Default destructor */
-    ~GCDepthConcatenateKernel() = default;
+    ~GCDepthConcatenateLayerKernel() = default;
     /** Initialise the kernel's inputs and output
      *
      * @param[in]     input        Input tensor. Data types supported: F16/F32.
diff --git a/arm_compute/core/NEON/NEKernels.h b/arm_compute/core/NEON/NEKernels.h
index b23e2ac5a3..6c31fa4fb1 100644
--- a/arm_compute/core/NEON/NEKernels.h
+++ b/arm_compute/core/NEON/NEKernels.h
@@ -44,9 +44,9 @@
 #include "arm_compute/core/NEON/kernels/NEConvolutionKernel.h"
 #include "arm_compute/core/NEON/kernels/NECumulativeDistributionKernel.h"
 #include "arm_compute/core/NEON/kernels/NEDeconvolutionLayerUpsampleKernel.h"
-#include "arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h"
-#include "arm_compute/core/NEON/kernels/NEDepthConvertKernel.h"
-#include "arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h"
+#include "arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h"
+#include "arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h"
+#include "arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h"
 #include "arm_compute/core/NEON/kernels/NEDepthwiseIm2ColKernel.h"
 #include "arm_compute/core/NEON/kernels/NEDepthwiseVectorToTensorKernel.h"
 #include "arm_compute/core/NEON/kernels/NEDepthwiseWeightsReshapeKernel.h"
@@ -83,7 +83,7 @@
 #include "arm_compute/core/NEON/kernels/NEHistogramKernel.h"
 #include "arm_compute/core/NEON/kernels/NEIm2ColKernel.h"
 #include "arm_compute/core/NEON/kernels/NEIntegralImageKernel.h"
-#include "arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h"
+#include "arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h"
 #include "arm_compute/core/NEON/kernels/NELKTrackerKernel.h"
 #include "arm_compute/core/NEON/kernels/NELocallyConnectedMatrixMultiplyKernel.h"
 #include "arm_compute/core/NEON/kernels/NEMagnitudePhaseKernel.h"
diff --git a/arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h
index 784dfc3f5c..6029873f22 100644
--- a/arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h
@@ -34,21 +34,21 @@ class ITensor;
 /** Interface for the depth concatenate kernel.
  *  The input tensor will be concatenated into the output tensor.
  */
-class NEDepthConcatenateKernel : public INEKernel
+class NEDepthConcatenateLayerKernel : public INEKernel
 {
 public:
     /** Default constructor */
-    NEDepthConcatenateKernel();
+    NEDepthConcatenateLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthConcatenateKernel(const NEDepthConcatenateKernel &) = delete;
+    NEDepthConcatenateLayerKernel(const NEDepthConcatenateLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthConcatenateKernel &operator=(const NEDepthConcatenateKernel &) = delete;
+    NEDepthConcatenateLayerKernel &operator=(const NEDepthConcatenateLayerKernel &) = delete;
     /** Allow instances of this class to be moved */
-    NEDepthConcatenateKernel(NEDepthConcatenateKernel &&) = default;
+    NEDepthConcatenateLayerKernel(NEDepthConcatenateLayerKernel &&) = default;
     /** Allow instances of this class to be moved */
-    NEDepthConcatenateKernel &operator=(NEDepthConcatenateKernel &&) = default;
+    NEDepthConcatenateLayerKernel &operator=(NEDepthConcatenateLayerKernel &&) = default;
     /** Default destructor */
-    ~NEDepthConcatenateKernel() = default;
+    ~NEDepthConcatenateLayerKernel() = default;
     /** Initialise the kernel's inputs and output
      *
      * @param[in]     input        Input tensor. Data types supported: QS8/QS16/F16/F32.
diff --git a/arm_compute/core/NEON/kernels/NEDepthConvertKernel.h b/arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h
index 332406f239..af51ded87a 100644
--- a/arm_compute/core/NEON/kernels/NEDepthConvertKernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h
@@ -34,19 +34,19 @@ namespace arm_compute
 class ITensor;
 
 /** Depth conversion kernel */
-class NEDepthConvertKernel : public INEKernel
+class NEDepthConvertLayerKernel : public INEKernel
 {
 public:
     /** Default constructor*/
-    NEDepthConvertKernel();
+    NEDepthConvertLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthConvertKernel(const NEDepthConvertKernel &) = delete;
+    NEDepthConvertLayerKernel(const NEDepthConvertLayerKernel &) = delete;
     /** Default move constructor */
-    NEDepthConvertKernel(NEDepthConvertKernel &&) = default;
+    NEDepthConvertLayerKernel(NEDepthConvertLayerKernel &&) = default;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthConvertKernel &operator=(const NEDepthConvertKernel &) = delete;
+    NEDepthConvertLayerKernel &operator=(const NEDepthConvertLayerKernel &) = delete;
     /** Default move assignment operator */
-    NEDepthConvertKernel &operator=(NEDepthConvertKernel &&) = default;
+    NEDepthConvertLayerKernel &operator=(NEDepthConvertLayerKernel &&) = default;
     /** Set the input and output of the kernel
      *
      * Valid conversions Input -> Output :
diff --git a/arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h b/arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h
index a32a06b61d..b8f01cb635 100644
--- a/arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h
+++ b/arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h
@@ -32,19 +32,19 @@ class ITensor;
 
 /** Interface for the kernel to run a 3x3 depthwise convolution on a tensor.
  */
-class NEDepthwiseConvolution3x3Kernel : public INEKernel
+class NEDepthwiseConvolutionLayer3x3Kernel : public INEKernel
 {
 public:
     /** Default constructor */
-    NEDepthwiseConvolution3x3Kernel();
+    NEDepthwiseConvolutionLayer3x3Kernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthwiseConvolution3x3Kernel(const NEDepthwiseConvolution3x3Kernel &) = delete;
+    NEDepthwiseConvolutionLayer3x3Kernel(const NEDepthwiseConvolutionLayer3x3Kernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEDepthwiseConvolution3x3Kernel &operator=(const NEDepthwiseConvolution3x3Kernel &) = delete;
+    NEDepthwiseConvolutionLayer3x3Kernel &operator=(const NEDepthwiseConvolutionLayer3x3Kernel &) = delete;
     /** Default Move Constructor. */
-    NEDepthwiseConvolution3x3Kernel(NEDepthwiseConvolution3x3Kernel &&) = default;
+    NEDepthwiseConvolutionLayer3x3Kernel(NEDepthwiseConvolutionLayer3x3Kernel &&) = default;
     /** Default move assignment operator. */
-    NEDepthwiseConvolution3x3Kernel &operator=(NEDepthwiseConvolution3x3Kernel &&) = default;
+    NEDepthwiseConvolutionLayer3x3Kernel &operator=(NEDepthwiseConvolutionLayer3x3Kernel &&) = default;
     /** Initialize the function's source, destination, conv and border_size.
      *
      * @param[in]  input     Source tensor. DataType supported: F32.
diff --git a/arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h b/arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h
index fbbe4bee99..7aa5116b68 100644
--- a/arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h
+++ b/arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h
@@ -31,21 +31,21 @@ namespace arm_compute
 class ITensor;
 
 /** Interface for performing a L2 normalize on a given axis given the square sum of it in this axis */
-class NEL2NormalizeKernel : public INEKernel
+class NEL2NormalizeLayerKernel : public INEKernel
 {
 public:
     /** Default constructor */
-    NEL2NormalizeKernel();
+    NEL2NormalizeLayerKernel();
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEL2NormalizeKernel(const NEL2NormalizeKernel &) = delete;
+    NEL2NormalizeLayerKernel(const NEL2NormalizeLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
-    NEL2NormalizeKernel &operator=(const NEL2NormalizeKernel &) = delete;
+    NEL2NormalizeLayerKernel &operator=(const NEL2NormalizeLayerKernel &) = delete;
     /** Allow instances of this class to be moved */
-    NEL2NormalizeKernel(NEL2NormalizeKernel &&) = default;
+    NEL2NormalizeLayerKernel(NEL2NormalizeLayerKernel &&) = default;
     /** Allow instances of this class to be moved */
-    NEL2NormalizeKernel &operator=(NEL2NormalizeKernel &&) = default;
+    NEL2NormalizeLayerKernel &operator=(NEL2NormalizeLayerKernel &&) = default;
     /** Default destructor */
-    ~NEL2NormalizeKernel() = default;
+    ~NEL2NormalizeLayerKernel() = default;
     /** Set the input and output tensors.
      *
      * @param[in]  input   Source tensor. Data types supported: F32.