diff --git a/arm_compute/graph/Edge.h b/arm_compute/graph/Edge.h
index 003b0de..e40914e 100644
--- a/arm_compute/graph/Edge.h
+++ b/arm_compute/graph/Edge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_EDGE_H__
-#define __ARM_COMPUTE_GRAPH_EDGE_H__
+#ifndef ARM_COMPUTE_GRAPH_EDGE_H
+#define ARM_COMPUTE_GRAPH_EDGE_H
 
 #include "arm_compute/graph/INode.h"
 #include "arm_compute/graph/Tensor.h"
@@ -149,4 +149,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_EDGE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_EDGE_H */
diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h
index 92507e7..c0c8129 100644
--- a/arm_compute/graph/Graph.h
+++ b/arm_compute/graph/Graph.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GRAPH_H__
-#define __ARM_COMPUTE_GRAPH_GRAPH_H__
+#ifndef ARM_COMPUTE_GRAPH_GRAPH_H
+#define ARM_COMPUTE_GRAPH_GRAPH_H
 
 #include "arm_compute/graph/Edge.h"
 #include "arm_compute/graph/INode.h"
@@ -261,4 +261,4 @@
 }
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GRAPH_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GRAPH_H */
diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h
index c1c56c3..c178ae1 100644
--- a/arm_compute/graph/GraphBuilder.h
+++ b/arm_compute/graph/GraphBuilder.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H__
-#define __ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H__
+#ifndef ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H
+#define ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H
 
 #include "arm_compute/graph/ITensorAccessor.h"
 #include "arm_compute/graph/LayerDescriptors.h"
@@ -511,4 +511,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GRAPH_BUILDER_H */
diff --git a/arm_compute/graph/GraphContext.h b/arm_compute/graph/GraphContext.h
index 0eb9e81..973264a 100644
--- a/arm_compute/graph/GraphContext.h
+++ b/arm_compute/graph/GraphContext.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H__
-#define __ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H__
+#ifndef ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H
+#define ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -131,4 +131,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GRAPH_CONTEXT_H */
diff --git a/arm_compute/graph/GraphManager.h b/arm_compute/graph/GraphManager.h
index 9526a0b..23fa732 100644
--- a/arm_compute/graph/GraphManager.h
+++ b/arm_compute/graph/GraphManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H__
-#define __ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H__
+#ifndef ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H
+#define ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H
 
 #include "arm_compute/graph/Types.h"
 #include "arm_compute/graph/Workload.h"
@@ -83,4 +83,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GRAPH_MANAGER_H */
diff --git a/arm_compute/graph/IDeviceBackend.h b/arm_compute/graph/IDeviceBackend.h
index cf54976..d40d752 100644
--- a/arm_compute/graph/IDeviceBackend.h
+++ b/arm_compute/graph/IDeviceBackend.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H__
-#define __ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H__
+#ifndef ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H
+#define ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 #include "arm_compute/graph/Types.h"
@@ -122,4 +122,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H__
+#endif //ARM_COMPUTE_GRAPH_IDEVICEBACKEND_H
diff --git a/arm_compute/graph/IGraphMutator.h b/arm_compute/graph/IGraphMutator.h
index 714fd7c..b80d37d 100644
--- a/arm_compute/graph/IGraphMutator.h
+++ b/arm_compute/graph/IGraphMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H
+#define ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H
 
 namespace arm_compute
 {
@@ -50,4 +50,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_IGRAPHMUTATOR_H */
diff --git a/arm_compute/graph/IGraphPrinter.h b/arm_compute/graph/IGraphPrinter.h
index aba52b1..73f3fa8 100644
--- a/arm_compute/graph/IGraphPrinter.h
+++ b/arm_compute/graph/IGraphPrinter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H__
-#define __ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H__
+#ifndef ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H
+#define ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H
 
 #include <ostream>
 
@@ -48,4 +48,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_IGRAPHPRINTER_H */
diff --git a/arm_compute/graph/INode.h b/arm_compute/graph/INode.h
index edff837..5536bb9 100644
--- a/arm_compute/graph/INode.h
+++ b/arm_compute/graph/INode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_INODE_H__
-#define __ARM_COMPUTE_GRAPH_INODE_H__
+#ifndef ARM_COMPUTE_GRAPH_INODE_H
+#define ARM_COMPUTE_GRAPH_INODE_H
 
 #include "arm_compute/core/Error.h"
 #include "arm_compute/graph/LayerDescriptors.h"
@@ -255,4 +255,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_INODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_INODE_H */
diff --git a/arm_compute/graph/INodeVisitor.h b/arm_compute/graph/INodeVisitor.h
index c17b775..59eddda 100644
--- a/arm_compute/graph/INodeVisitor.h
+++ b/arm_compute/graph/INodeVisitor.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_INODEVISITOR_H__
-#define __ARM_COMPUTE_GRAPH_INODEVISITOR_H__
+#ifndef ARM_COMPUTE_GRAPH_INODEVISITOR_H
+#define ARM_COMPUTE_GRAPH_INODEVISITOR_H
 
 #include "arm_compute/graph/nodes/NodesFwd.h"
 
@@ -294,4 +294,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_INODEVISITOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_INODEVISITOR_H */
diff --git a/arm_compute/graph/ITensorAccessor.h b/arm_compute/graph/ITensorAccessor.h
index 2df39c2..f7add37 100644
--- a/arm_compute/graph/ITensorAccessor.h
+++ b/arm_compute/graph/ITensorAccessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ITENSOR_ACCESSOR_H__
-#define __ARM_COMPUTE_GRAPH_ITENSOR_ACCESSOR_H__
+#ifndef ARM_COMPUTE_GRAPH_ITENSOR_ACCESSOR_H
+#define ARM_COMPUTE_GRAPH_ITENSOR_ACCESSOR_H
 
 #include "arm_compute/core/ITensor.h"
 
@@ -50,4 +50,4 @@
 using ITensorAccessorUPtr = std::unique_ptr<ITensorAccessor>;
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SUB_STREAM_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_GRAPH_SUB_STREAM_H */
\ No newline at end of file
diff --git a/arm_compute/graph/ITensorHandle.h b/arm_compute/graph/ITensorHandle.h
index 261ebf5..1d78e78 100644
--- a/arm_compute/graph/ITensorHandle.h
+++ b/arm_compute/graph/ITensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ITENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_ITENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_ITENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_ITENSORHANDLE_H
 
 #include "arm_compute/core/ITensor.h"
 #include "arm_compute/graph/Types.h"
@@ -87,4 +87,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ITENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ITENSORHANDLE_H */
diff --git a/arm_compute/graph/LayerDescriptors.h b/arm_compute/graph/LayerDescriptors.h
index f52beab..94074e5 100644
--- a/arm_compute/graph/LayerDescriptors.h
+++ b/arm_compute/graph/LayerDescriptors.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__
-#define __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__
+#ifndef ARM_COMPUTE_CONCAT_DESCRIPTOR_H
+#define ARM_COMPUTE_CONCAT_DESCRIPTOR_H
 
 #include "arm_compute/core/Types.h"
 
@@ -66,4 +66,4 @@
 } // namespace descriptor
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_CONCAT_DESCRIPTOR_H */
\ No newline at end of file
diff --git a/arm_compute/graph/Logger.h b/arm_compute/graph/Logger.h
index 8946d82..8aa87f0 100644
--- a/arm_compute/graph/Logger.h
+++ b/arm_compute/graph/Logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_LOGGER_H__
-#define __ARM_COMPUTE_GRAPH_LOGGER_H__
+#ifndef ARM_COMPUTE_GRAPH_LOGGER_H
+#define ARM_COMPUTE_GRAPH_LOGGER_H
 
 #include "arm_compute/core/utils/logging/Macros.h"
 
@@ -63,4 +63,4 @@
     ARM_COMPUTE_CREATE_DEFAULT_GRAPH_LOGGER(); \
     ARM_COMPUTE_LOG_STREAM("GRAPH", arm_compute::logging::LogLevel::ERROR, x)
 
-#endif /* __ARM_COMPUTE_GRAPH_LOGGER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_LOGGER_H */
diff --git a/arm_compute/graph/PassManager.h b/arm_compute/graph/PassManager.h
index 2263604..c2b2319 100644
--- a/arm_compute/graph/PassManager.h
+++ b/arm_compute/graph/PassManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_PASSMANAGER_H__
-#define __ARM_COMPUTE_GRAPH_PASSMANAGER_H__
+#ifndef ARM_COMPUTE_GRAPH_PASSMANAGER_H
+#define ARM_COMPUTE_GRAPH_PASSMANAGER_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -90,4 +90,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_PASSMANAGER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_PASSMANAGER_H */
diff --git a/arm_compute/graph/Tensor.h b/arm_compute/graph/Tensor.h
index 07eec1e..42d5d10 100644
--- a/arm_compute/graph/Tensor.h
+++ b/arm_compute/graph/Tensor.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_TENSOR_H__
-#define __ARM_COMPUTE_GRAPH_TENSOR_H__
+#ifndef ARM_COMPUTE_GRAPH_TENSOR_H
+#define ARM_COMPUTE_GRAPH_TENSOR_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -119,4 +119,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_TENSOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_TENSOR_H */
diff --git a/arm_compute/graph/TensorDescriptor.h b/arm_compute/graph/TensorDescriptor.h
index 704f015..4441e0f 100644
--- a/arm_compute/graph/TensorDescriptor.h
+++ b/arm_compute/graph/TensorDescriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H__
-#define __ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H__
+#ifndef ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H
+#define ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -114,4 +114,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_TENSOR_DESCRIPTOR_H */
diff --git a/arm_compute/graph/TypeLoader.h b/arm_compute/graph/TypeLoader.h
index 41f382a..e1b920c 100644
--- a/arm_compute/graph/TypeLoader.h
+++ b/arm_compute/graph/TypeLoader.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_TYPE_LOADER_H__
-#define __ARM_COMPUTE_GRAPH_TYPE_LOADER_H__
+#ifndef ARM_COMPUTE_GRAPH_TYPE_LOADER_H
+#define ARM_COMPUTE_GRAPH_TYPE_LOADER_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -149,4 +149,4 @@
 
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_TYPE_LOADER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_TYPE_LOADER_H */
diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h
index 7610852..243a893 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_TYPE_PRINTER_H__
-#define __ARM_COMPUTE_GRAPH_TYPE_PRINTER_H__
+#ifndef ARM_COMPUTE_GRAPH_TYPE_PRINTER_H
+#define ARM_COMPUTE_GRAPH_TYPE_PRINTER_H
 
 #include "arm_compute/core/Error.h"
 #include "arm_compute/core/Types.h"
@@ -265,4 +265,4 @@
 }
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_TYPE_PRINTER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_TYPE_PRINTER_H */
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index c01f9a8..c337126 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_TYPES_H__
-#define __ARM_COMPUTE_GRAPH_TYPES_H__
+#ifndef ARM_COMPUTE_GRAPH_TYPES_H
+#define ARM_COMPUTE_GRAPH_TYPES_H
 
 #include "arm_compute/core/Error.h"
 #include "arm_compute/core/Types.h"
@@ -197,4 +197,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_TYPES_H__ */
+#endif /* ARM_COMPUTE_GRAPH_TYPES_H */
diff --git a/arm_compute/graph/Utils.h b/arm_compute/graph/Utils.h
index 2fa2f3b..1760bc6 100644
--- a/arm_compute/graph/Utils.h
+++ b/arm_compute/graph/Utils.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_UTILS_H__
-#define __ARM_COMPUTE_GRAPH_UTILS_H__
+#ifndef ARM_COMPUTE_GRAPH_UTILS_H
+#define ARM_COMPUTE_GRAPH_UTILS_H
 
 #include "arm_compute/graph/Graph.h"
 #include "arm_compute/graph/PassManager.h"
@@ -130,4 +130,4 @@
 void configure_tensor(Tensor *tensor);
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_UTILS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_UTILS_H */
diff --git a/arm_compute/graph/Workload.h b/arm_compute/graph/Workload.h
index 682b08d..3f70181 100644
--- a/arm_compute/graph/Workload.h
+++ b/arm_compute/graph/Workload.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_WORKLOAD_H__
-#define __ARM_COMPUTE_GRAPH_WORKLOAD_H__
+#ifndef ARM_COMPUTE_GRAPH_WORKLOAD_H
+#define ARM_COMPUTE_GRAPH_WORKLOAD_H
 
 #include "arm_compute/graph/GraphContext.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -105,4 +105,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_WORKLOAD_H__ */
+#endif /* ARM_COMPUTE_GRAPH_WORKLOAD_H */
diff --git a/arm_compute/graph/algorithms/Algorithms.h b/arm_compute/graph/algorithms/Algorithms.h
index 7af2455..89441c8 100644
--- a/arm_compute/graph/algorithms/Algorithms.h
+++ b/arm_compute/graph/algorithms/Algorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ALGORITHMS_H__
-#define __ARM_COMPUTE_GRAPH_ALGORITHMS_H__
+#ifndef ARM_COMPUTE_GRAPH_ALGORITHMS_H
+#define ARM_COMPUTE_GRAPH_ALGORITHMS_H
 
 #include "arm_compute/graph/algorithms/TopologicalSort.h"
 
-#endif /* __ARM_COMPUTE_GRAPH_ALGORITHMS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ALGORITHMS_H */
diff --git a/arm_compute/graph/algorithms/TopologicalSort.h b/arm_compute/graph/algorithms/TopologicalSort.h
index 6684844..486c0b5 100644
--- a/arm_compute/graph/algorithms/TopologicalSort.h
+++ b/arm_compute/graph/algorithms/TopologicalSort.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H__
-#define __ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H__
+#ifndef ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H
+#define ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -51,4 +51,4 @@
 std::vector<NodeID> dfs(Graph &g);
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ALGORITHM_TOPOLOGICAL_SORT_H */
diff --git a/arm_compute/graph/backends/BackendRegistrar.h b/arm_compute/graph/backends/BackendRegistrar.h
index f7f2f7f..5d1582d 100644
--- a/arm_compute/graph/backends/BackendRegistrar.h
+++ b/arm_compute/graph/backends/BackendRegistrar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H__
-#define ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H
+#define ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H
 
 #include "arm_compute/graph/Types.h"
 #include "arm_compute/graph/backends/BackendRegistry.h"
@@ -58,4 +58,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_GRAPH_BACKEND_REGISTRAR_H */
\ No newline at end of file
diff --git a/arm_compute/graph/backends/BackendRegistry.h b/arm_compute/graph/backends/BackendRegistry.h
index 09aa17f..163938b 100644
--- a/arm_compute/graph/backends/BackendRegistry.h
+++ b/arm_compute/graph/backends/BackendRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H__
-#define __ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H
+#define ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H
 
 #include "arm_compute/graph/IDeviceBackend.h"
 #include "arm_compute/graph/Types.h"
@@ -98,4 +98,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKEND_REGISTRY_H */
diff --git a/arm_compute/graph/backends/CL/CLDeviceBackend.h b/arm_compute/graph/backends/CL/CLDeviceBackend.h
index 8e5fe8c..492dca0 100644
--- a/arm_compute/graph/backends/CL/CLDeviceBackend.h
+++ b/arm_compute/graph/backends/CL/CLDeviceBackend.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H__
-#define __ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H__
+#ifndef ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H
+#define ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H
 
 #include "arm_compute/graph/IDeviceBackend.h"
 
@@ -70,12 +70,12 @@
     std::shared_ptr<arm_compute::IWeightsManager> create_weights_manager() override;
 
 private:
-    int                                   _context_count; /**< Counts how many contexts are currently using the backend */
-    CLTuner                               _tuner;         /**< CL kernel tuner */
-    std::unique_ptr<CLBufferAllocator>    _allocator;     /**< CL buffer affinity allocator */
-    std::string                           _tuner_file;    /**< Filename to load/store the tuner's values from */
+    int                                _context_count; /**< Counts how many contexts are currently using the backend */
+    CLTuner                            _tuner;         /**< CL kernel tuner */
+    std::unique_ptr<CLBufferAllocator> _allocator;     /**< CL buffer affinity allocator */
+    std::string                        _tuner_file;    /**< Filename to load/store the tuner's values from */
 };
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H__
+#endif //ARM_COMPUTE_GRAPH_CLDEVICEBACKEND_H
diff --git a/arm_compute/graph/backends/CL/CLFunctionFactory.h b/arm_compute/graph/backends/CL/CLFunctionFactory.h
index 6caca54..264612c 100644
--- a/arm_compute/graph/backends/CL/CLFunctionFactory.h
+++ b/arm_compute/graph/backends/CL/CLFunctionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H__
-#define __ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H__
+#ifndef ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H
+#define ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -54,4 +54,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H__
+#endif //ARM_COMPUTE_GRAPH_CLFUNCTIONFACTORY_H
diff --git a/arm_compute/graph/backends/CL/CLNodeValidator.h b/arm_compute/graph/backends/CL/CLNodeValidator.h
index 9bd4842..2f43cd4 100644
--- a/arm_compute/graph/backends/CL/CLNodeValidator.h
+++ b/arm_compute/graph/backends/CL/CLNodeValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H__
-#define __ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H
+#define ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H
 
 #include "arm_compute/core/Error.h"
 
@@ -49,4 +49,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H__
+#endif //ARM_COMPUTE_GRAPH_CLNODEVALIDATOR_H
diff --git a/arm_compute/graph/backends/CL/CLSubTensorHandle.h b/arm_compute/graph/backends/CL/CLSubTensorHandle.h
index 0c515a1..3379feb 100644
--- a/arm_compute/graph/backends/CL/CLSubTensorHandle.h
+++ b/arm_compute/graph/backends/CL/CLSubTensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 
@@ -77,4 +77,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CLSUBTENSORHANDLE_H */
diff --git a/arm_compute/graph/backends/CL/CLTensorHandle.h b/arm_compute/graph/backends/CL/CLTensorHandle.h
index 2399732..1452ef8 100644
--- a/arm_compute/graph/backends/CL/CLTensorHandle.h
+++ b/arm_compute/graph/backends/CL/CLTensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 
@@ -69,4 +69,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CLTENSORHANDLE_H */
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index 960011c..a02e323 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H__
-#define __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H
+#define ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H
 
 #include "arm_compute/graph/Logger.h"
 #include "arm_compute/graph/Tensor.h"
@@ -1596,4 +1596,4 @@
 } // namespace graph
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_FUNCTION_HELPERS_H */
diff --git a/arm_compute/graph/backends/FusedConvolutionBatchNormalizationFunction.h b/arm_compute/graph/backends/FusedConvolutionBatchNormalizationFunction.h
index 0af3abc..895906d 100644
--- a/arm_compute/graph/backends/FusedConvolutionBatchNormalizationFunction.h
+++ b/arm_compute/graph/backends/FusedConvolutionBatchNormalizationFunction.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H__
-#define __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H
+#define ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -130,4 +130,4 @@
 } // namespace graph
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKENDS_FUSED_CONVOLUTION_BATCH_NORMAZLIZATION_FUNCTION_H */
diff --git a/arm_compute/graph/backends/FusedDepthwiseConvolutionBatchNormalizationFunction.h b/arm_compute/graph/backends/FusedDepthwiseConvolutionBatchNormalizationFunction.h
index 14474f4..37f3eab 100644
--- a/arm_compute/graph/backends/FusedDepthwiseConvolutionBatchNormalizationFunction.h
+++ b/arm_compute/graph/backends/FusedDepthwiseConvolutionBatchNormalizationFunction.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H__
-#define __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H
+#define ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -128,4 +128,4 @@
 } // namespace graph
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKENDS_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_FUNCTION_H */
diff --git a/arm_compute/graph/backends/GLES/GCDeviceBackend.h b/arm_compute/graph/backends/GLES/GCDeviceBackend.h
index 83a7458..a6c0bfe 100644
--- a/arm_compute/graph/backends/GLES/GCDeviceBackend.h
+++ b/arm_compute/graph/backends/GLES/GCDeviceBackend.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H__
-#define __ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H__
+#ifndef ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H
+#define ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H
 
 #include "arm_compute/graph/IDeviceBackend.h"
 
@@ -61,4 +61,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H__
+#endif //ARM_COMPUTE_GRAPH_GCDEVICEBACKEND_H
diff --git a/arm_compute/graph/backends/GLES/GCFunctionFactory.h b/arm_compute/graph/backends/GLES/GCFunctionFactory.h
index c819c03..289a3cb 100644
--- a/arm_compute/graph/backends/GLES/GCFunctionFactory.h
+++ b/arm_compute/graph/backends/GLES/GCFunctionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H__
-#define __ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H__
+#ifndef ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H
+#define ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -54,4 +54,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H__
+#endif //ARM_COMPUTE_GRAPH_GCFUNCTIONFACTORY_H
diff --git a/arm_compute/graph/backends/GLES/GCNodeValidator.h b/arm_compute/graph/backends/GLES/GCNodeValidator.h
index 6fdfbdd..89421f7 100644
--- a/arm_compute/graph/backends/GLES/GCNodeValidator.h
+++ b/arm_compute/graph/backends/GLES/GCNodeValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H__
-#define __ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H
+#define ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H
 
 #include "arm_compute/core/Error.h"
 
@@ -49,4 +49,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H__
+#endif //ARM_COMPUTE_GRAPH_GCNODEVALIDATOR_H
diff --git a/arm_compute/graph/backends/GLES/GCTensorHandle.h b/arm_compute/graph/backends/GLES/GCTensorHandle.h
index 29b0319..119731d 100644
--- a/arm_compute/graph/backends/GLES/GCTensorHandle.h
+++ b/arm_compute/graph/backends/GLES/GCTensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 
@@ -69,4 +69,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GCTENSORHANDLE_H */
diff --git a/arm_compute/graph/backends/NEON/NEDeviceBackend.h b/arm_compute/graph/backends/NEON/NEDeviceBackend.h
index 9891170..87acc55 100644
--- a/arm_compute/graph/backends/NEON/NEDeviceBackend.h
+++ b/arm_compute/graph/backends/NEON/NEDeviceBackend.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H__
-#define __ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H__
+#ifndef ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H
+#define ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H
 
 #include "arm_compute/graph/IDeviceBackend.h"
 
@@ -59,4 +59,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H__
+#endif //ARM_COMPUTE_GRAPH_NEDEVICEBACKEND_H
diff --git a/arm_compute/graph/backends/NEON/NEFunctionFactory.h b/arm_compute/graph/backends/NEON/NEFunctionFactory.h
index 1143c29..b05b9f0 100644
--- a/arm_compute/graph/backends/NEON/NEFunctionFactory.h
+++ b/arm_compute/graph/backends/NEON/NEFunctionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H__
-#define __ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H__
+#ifndef ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H
+#define ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H
 
 #include "arm_compute/runtime/IFunction.h"
 
@@ -54,4 +54,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H__
+#endif //ARM_COMPUTE_GRAPH_NEFUNCTIONFACTORY_H
diff --git a/arm_compute/graph/backends/NEON/NENodeValidator.h b/arm_compute/graph/backends/NEON/NENodeValidator.h
index 38f58a9..578f405 100644
--- a/arm_compute/graph/backends/NEON/NENodeValidator.h
+++ b/arm_compute/graph/backends/NEON/NENodeValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H__
-#define __ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H
+#define ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H
 
 #include "arm_compute/core/Error.h"
 
@@ -49,4 +49,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H__
+#endif //ARM_COMPUTE_GRAPH_NENODEVALIDATOR_H
diff --git a/arm_compute/graph/backends/NEON/NESubTensorHandle.h b/arm_compute/graph/backends/NEON/NESubTensorHandle.h
index 101d3e6..1dbc053 100644
--- a/arm_compute/graph/backends/NEON/NESubTensorHandle.h
+++ b/arm_compute/graph/backends/NEON/NESubTensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 
@@ -77,4 +77,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NESUBTENSORHANDLE_H */
diff --git a/arm_compute/graph/backends/NEON/NETensorHandle.h b/arm_compute/graph/backends/NEON/NETensorHandle.h
index 150e0c9..0f1b748 100644
--- a/arm_compute/graph/backends/NEON/NETensorHandle.h
+++ b/arm_compute/graph/backends/NEON/NETensorHandle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NETENSORHANDLE_H__
-#define __ARM_COMPUTE_GRAPH_NETENSORHANDLE_H__
+#ifndef ARM_COMPUTE_GRAPH_NETENSORHANDLE_H
+#define ARM_COMPUTE_GRAPH_NETENSORHANDLE_H
 
 #include "arm_compute/graph/ITensorHandle.h"
 
@@ -69,4 +69,4 @@
 } // namespace backends
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NETENSORHANDLE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NETENSORHANDLE_H */
diff --git a/arm_compute/graph/backends/Utils.h b/arm_compute/graph/backends/Utils.h
index 2ca97ff..4893340 100644
--- a/arm_compute/graph/backends/Utils.h
+++ b/arm_compute/graph/backends/Utils.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H__
-#define __ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H
+#define ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H
 
 #include "arm_compute/graph/GraphContext.h"
 #include "arm_compute/runtime/IMemoryManager.h"
@@ -108,4 +108,4 @@
 } // namespace graph
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKENDS_UTILS_H */
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index 090e2d6..66de7ad 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H__
-#define __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H__
+#ifndef ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H
+#define ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H
 
 #include "arm_compute/graph/Logger.h"
 #include "arm_compute/graph/Tensor.h"
@@ -560,4 +560,4 @@
 } // namespace graph
 } // namespace arm_compute
 
-#endif /* __ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BACKENDS_DETAIL_VALIDATE_HELPERS_H */
diff --git a/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h b/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h
index da17806..30c084e 100644
--- a/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h
+++ b/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H__
-#define __ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H__
+#ifndef ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H
+#define ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H
 
 #include <vector>
 
@@ -49,4 +49,4 @@
 } // namespace detail
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DETAIL_CROSS_LAYER_MEMORY_MANAGER_HELPERS_H */
diff --git a/arm_compute/graph/detail/ExecutionHelpers.h b/arm_compute/graph/detail/ExecutionHelpers.h
index 955e6d5..aa1af27 100644
--- a/arm_compute/graph/detail/ExecutionHelpers.h
+++ b/arm_compute/graph/detail/ExecutionHelpers.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H__
-#define __ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H__
+#ifndef ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H
+#define ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -120,4 +120,4 @@
 } // namespace detail
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DETAIL_EXECUTION_HELPERS_H */
diff --git a/arm_compute/graph/frontend/ILayer.h b/arm_compute/graph/frontend/ILayer.h
index f7caaea..30652a7 100644
--- a/arm_compute/graph/frontend/ILayer.h
+++ b/arm_compute/graph/frontend/ILayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ILAYER_H__
-#define __ARM_COMPUTE_GRAPH_ILAYER_H__
+#ifndef ARM_COMPUTE_GRAPH_ILAYER_H
+#define ARM_COMPUTE_GRAPH_ILAYER_H
 
 namespace arm_compute
 {
@@ -72,4 +72,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ILAYER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ILAYER_H */
diff --git a/arm_compute/graph/frontend/IStream.h b/arm_compute/graph/frontend/IStream.h
index 13995f9..e155bbc 100644
--- a/arm_compute/graph/frontend/IStream.h
+++ b/arm_compute/graph/frontend/IStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ISTREAM_H__
-#define __ARM_COMPUTE_GRAPH_ISTREAM_H__
+#ifndef ARM_COMPUTE_GRAPH_ISTREAM_H
+#define ARM_COMPUTE_GRAPH_ISTREAM_H
 
 #include "arm_compute/graph/frontend/Types.h"
 
@@ -90,4 +90,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ISTREAM_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ISTREAM_H */
diff --git a/arm_compute/graph/frontend/IStreamOperators.h b/arm_compute/graph/frontend/IStreamOperators.h
index 4d680f9..8e2ca41 100644
--- a/arm_compute/graph/frontend/IStreamOperators.h
+++ b/arm_compute/graph/frontend/IStreamOperators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H__
-#define __ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H__
+#ifndef ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H
+#define ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H
 
 #include "arm_compute/graph/frontend/IStream.h"
 #include "arm_compute/graph/frontend/Types.h"
@@ -111,4 +111,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ISTREAM_OPERATORS_H */
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index 61cd83c..ec69350 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_LAYERS_H__
-#define __ARM_COMPUTE_GRAPH_LAYERS_H__
+#ifndef ARM_COMPUTE_GRAPH_LAYERS_H
+#define ARM_COMPUTE_GRAPH_LAYERS_H
 
 #include "arm_compute/graph/GraphBuilder.h"
 #include "arm_compute/graph/Types.h"
@@ -1275,4 +1275,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_LAYERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_LAYERS_H */
diff --git a/arm_compute/graph/frontend/Stream.h b/arm_compute/graph/frontend/Stream.h
index 9d51016..1d9fc1a 100644
--- a/arm_compute/graph/frontend/Stream.h
+++ b/arm_compute/graph/frontend/Stream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_STREAM_H__
-#define __ARM_COMPUTE_GRAPH_STREAM_H__
+#ifndef ARM_COMPUTE_GRAPH_STREAM_H
+#define ARM_COMPUTE_GRAPH_STREAM_H
 
 #include "arm_compute/graph/frontend/IStream.h"
 #include "arm_compute/graph/frontend/IStreamOperators.h"
@@ -83,4 +83,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_STREAM_H__ */
+#endif /* ARM_COMPUTE_GRAPH_STREAM_H */
diff --git a/arm_compute/graph/frontend/SubStream.h b/arm_compute/graph/frontend/SubStream.h
index b759534..3df7379 100644
--- a/arm_compute/graph/frontend/SubStream.h
+++ b/arm_compute/graph/frontend/SubStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_SUB_STREAM_H__
-#define __ARM_COMPUTE_GRAPH_SUB_STREAM_H__
+#ifndef ARM_COMPUTE_GRAPH_SUB_STREAM_H
+#define ARM_COMPUTE_GRAPH_SUB_STREAM_H
 
 #include "arm_compute/graph/frontend/IStream.h"
 #include "arm_compute/graph/frontend/IStreamOperators.h"
@@ -64,4 +64,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SUB_STREAM_H__ */
+#endif /* ARM_COMPUTE_GRAPH_SUB_STREAM_H */
diff --git a/arm_compute/graph/frontend/Types.h b/arm_compute/graph/frontend/Types.h
index 79ce52e..741412d 100644
--- a/arm_compute/graph/frontend/Types.h
+++ b/arm_compute/graph/frontend/Types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_STREAM_TYPES_H__
-#define __ARM_COMPUTE_GRAPH_STREAM_TYPES_H__
+#ifndef ARM_COMPUTE_GRAPH_STREAM_TYPES_H
+#define ARM_COMPUTE_GRAPH_STREAM_TYPES_H
 
 #include "arm_compute/graph/Types.h"
 
@@ -68,4 +68,4 @@
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_STREAM_TYPES_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_GRAPH_STREAM_TYPES_H */
\ No newline at end of file
diff --git a/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h b/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h
index 0ddd3fa..11fc82f 100644
--- a/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h
+++ b/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -43,4 +43,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DEPTH_CONCAT_SUBTENSOR_MUTATOR_H */
diff --git a/arm_compute/graph/mutators/GraphMutators.h b/arm_compute/graph/mutators/GraphMutators.h
index 67c4d7a..f6e390e 100644
--- a/arm_compute/graph/mutators/GraphMutators.h
+++ b/arm_compute/graph/mutators/GraphMutators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H__
-#define __ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H__
+#ifndef ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H
+#define ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H
 
 #include "arm_compute/graph/mutators/DepthConcatSubTensorMutator.h"
 #include "arm_compute/graph/mutators/GroupedConvolutionMutator.h"
@@ -31,4 +31,4 @@
 #include "arm_compute/graph/mutators/NodeFusionMutator.h"
 #include "arm_compute/graph/mutators/SplitLayerSubTensorMutator.h"
 
-#endif /* __ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H */
diff --git a/arm_compute/graph/mutators/GroupedConvolutionMutator.h b/arm_compute/graph/mutators/GroupedConvolutionMutator.h
index 8ce2554..b6dac71 100644
--- a/arm_compute/graph/mutators/GroupedConvolutionMutator.h
+++ b/arm_compute/graph/mutators/GroupedConvolutionMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -43,4 +43,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_GROUPED_CONVOLUTION_MUTATOR_H */
diff --git a/arm_compute/graph/mutators/InPlaceOperationMutator.h b/arm_compute/graph/mutators/InPlaceOperationMutator.h
index 69de2f1..43e8838 100644
--- a/arm_compute/graph/mutators/InPlaceOperationMutator.h
+++ b/arm_compute/graph/mutators/InPlaceOperationMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -40,4 +40,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_INPLACE_OPERATION_MUTATOR_H */
diff --git a/arm_compute/graph/mutators/NodeExecutionMethodMutator.h b/arm_compute/graph/mutators/NodeExecutionMethodMutator.h
index f961f5d..59df818 100644
--- a/arm_compute/graph/mutators/NodeExecutionMethodMutator.h
+++ b/arm_compute/graph/mutators/NodeExecutionMethodMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -45,4 +45,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NODE_EXECUTION_METHOD_MUTATOR_H */
diff --git a/arm_compute/graph/mutators/NodeFusionMutator.h b/arm_compute/graph/mutators/NodeFusionMutator.h
index b9ca464..a4dd5c9 100644
--- a/arm_compute/graph/mutators/NodeFusionMutator.h
+++ b/arm_compute/graph/mutators/NodeFusionMutator.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H
 
 #include "arm_compute/graph/Graph.h"
 #include "arm_compute/graph/IGraphMutator.h"
@@ -41,4 +41,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NODE_FUSION_MUTATOR_H */
diff --git a/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h b/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h
index f349bb9..29d061f 100644
--- a/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h
+++ b/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H__
-#define __ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H__
+#ifndef ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H
+#define ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H
 
 #include "arm_compute/graph/IGraphMutator.h"
 
@@ -43,4 +43,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H__ */
+#endif /* ARM_COMPUTE_GRAPH_SPLIT_LAYER_SUBTENSOR_MUTATOR_H */
diff --git a/arm_compute/graph/nodes/ActivationLayerNode.h b/arm_compute/graph/nodes/ActivationLayerNode.h
index a17b010..975bc8e 100644
--- a/arm_compute/graph/nodes/ActivationLayerNode.h
+++ b/arm_compute/graph/nodes/ActivationLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -62,4 +62,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/BatchNormalizationLayerNode.h b/arm_compute/graph/nodes/BatchNormalizationLayerNode.h
index b228478..b50b955 100644
--- a/arm_compute/graph/nodes/BatchNormalizationLayerNode.h
+++ b/arm_compute/graph/nodes/BatchNormalizationLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -71,4 +71,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h
index 8f5c8ea..062054e 100644
--- a/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h
+++ b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H__
-#define __ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H__
+#ifndef ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H
+#define ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -57,4 +57,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H__ */
+#endif /* ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H */
diff --git a/arm_compute/graph/nodes/ChannelShuffleLayerNode.h b/arm_compute/graph/nodes/ChannelShuffleLayerNode.h
index 696012a..830efb9 100644
--- a/arm_compute/graph/nodes/ChannelShuffleLayerNode.h
+++ b/arm_compute/graph/nodes/ChannelShuffleLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -56,4 +56,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CHANNEL_SHUFFLE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/ConcatenateLayerNode.h b/arm_compute/graph/nodes/ConcatenateLayerNode.h
index fc12284..77ca6f6 100644
--- a/arm_compute/graph/nodes/ConcatenateLayerNode.h
+++ b/arm_compute/graph/nodes/ConcatenateLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -87,4 +87,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CONCATENATE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/ConstNode.h b/arm_compute/graph/nodes/ConstNode.h
index 3216a3a..24dfaaa 100644
--- a/arm_compute/graph/nodes/ConstNode.h
+++ b/arm_compute/graph/nodes/ConstNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CONST_NODE_H__
-#define __ARM_COMPUTE_GRAPH_CONST_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_CONST_NODE_H
+#define ARM_COMPUTE_GRAPH_CONST_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -51,4 +51,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CONST_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CONST_NODE_H */
diff --git a/arm_compute/graph/nodes/ConvolutionLayerNode.h b/arm_compute/graph/nodes/ConvolutionLayerNode.h
index eecb927..eea43d7 100644
--- a/arm_compute/graph/nodes/ConvolutionLayerNode.h
+++ b/arm_compute/graph/nodes/ConvolutionLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -121,4 +121,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/DeconvolutionLayerNode.h b/arm_compute/graph/nodes/DeconvolutionLayerNode.h
index e6869d7..09601ab 100644
--- a/arm_compute/graph/nodes/DeconvolutionLayerNode.h
+++ b/arm_compute/graph/nodes/DeconvolutionLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -67,4 +67,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DECONVOLUTION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h b/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h
index fd02734..d8d36d9 100644
--- a/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h
+++ b/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -110,4 +110,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DEPTHWISE_CONVOLUTION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/DetectionOutputLayerNode.h b/arm_compute/graph/nodes/DetectionOutputLayerNode.h
index da1b051..7732abf 100644
--- a/arm_compute/graph/nodes/DetectionOutputLayerNode.h
+++ b/arm_compute/graph/nodes/DetectionOutputLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -67,4 +67,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h b/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h
index 76b1d8c..97d881d 100644
--- a/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h
+++ b/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -59,4 +59,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H */
\ No newline at end of file
diff --git a/arm_compute/graph/nodes/DummyNode.h b/arm_compute/graph/nodes/DummyNode.h
index 72d73ec..e257641 100644
--- a/arm_compute/graph/nodes/DummyNode.h
+++ b/arm_compute/graph/nodes/DummyNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DUMMY_NODE_H__
-#define __ARM_COMPUTE_GRAPH_DUMMY_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_DUMMY_NODE_H
+#define ARM_COMPUTE_GRAPH_DUMMY_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -58,4 +58,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DUMMY_NODE_H__ */
\ No newline at end of file
+#endif /* ARM_COMPUTE_GRAPH_DUMMY_NODE_H */
\ No newline at end of file
diff --git a/arm_compute/graph/nodes/EltwiseLayerNode.h b/arm_compute/graph/nodes/EltwiseLayerNode.h
index 09cbc75..7fb0aff 100644
--- a/arm_compute/graph/nodes/EltwiseLayerNode.h
+++ b/arm_compute/graph/nodes/EltwiseLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -72,4 +72,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ELTWISE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/FlattenLayerNode.h b/arm_compute/graph/nodes/FlattenLayerNode.h
index 18a96ab..fd9a525 100644
--- a/arm_compute/graph/nodes/FlattenLayerNode.h
+++ b/arm_compute/graph/nodes/FlattenLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -45,4 +45,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_FLATTEN_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/FullyConnectedLayerNode.h b/arm_compute/graph/nodes/FullyConnectedLayerNode.h
index 80dc284..41a7bc9 100644
--- a/arm_compute/graph/nodes/FullyConnectedLayerNode.h
+++ b/arm_compute/graph/nodes/FullyConnectedLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -90,4 +90,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h b/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h
index c124c982..62ec55e 100644
--- a/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h
+++ b/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_BATCH_NORMALIZATION_NODE_H__
-#define __ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_BATCH_NORMALIZATION_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_BATCH_NORMALIZATION_NODE_H
+#define ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_BATCH_NORMALIZATION_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -44,9 +44,9 @@
      * @param[in] fused_activation (Optional) Fused activation layer. Disabled if not specified
      */
     FusedConvolutionBatchNormalizationNode(float epsilon, PadStrideInfo info,
-                                           unsigned int      num_groups     = 1,
-                                           ConvolutionMethod method         = ConvolutionMethod::Default,
-                                           FastMathHint      fast_math_hint = FastMathHint::Disabled,
+                                           unsigned int        num_groups       = 1,
+                                           ConvolutionMethod   method           = ConvolutionMethod::Default,
+                                           FastMathHint        fast_math_hint   = FastMathHint::Disabled,
                                            ActivationLayerInfo fused_activation = ActivationLayerInfo());
 
     /** Epsilon parameter accessor
@@ -139,4 +139,4 @@
 
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_BATCH_NORMALIZATION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h b/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h
index a2241ef..668f09e 100644
--- a/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h
+++ b/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H__
-#define __ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H
+#define ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -133,4 +133,4 @@
 
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_FUSED_DEPTHWISE_CONVOLUTION_BATCH_NORMALIZATION_NODE_H */
diff --git a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
index d8c0c78..57cadf4 100644
--- a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
+++ b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__
-#define __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__
+#ifndef ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H
+#define ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -57,4 +57,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__ */
+#endif /* ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H */
diff --git a/arm_compute/graph/nodes/InputNode.h b/arm_compute/graph/nodes/InputNode.h
index 4297c8a..20fc276 100644
--- a/arm_compute/graph/nodes/InputNode.h
+++ b/arm_compute/graph/nodes/InputNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_INPUT_NODE_H__
-#define __ARM_COMPUTE_GRAPH_INPUT_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_INPUT_NODE_H
+#define ARM_COMPUTE_GRAPH_INPUT_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -51,4 +51,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_INPUT_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_INPUT_NODE_H */
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index 7b586b8..830e8fa 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NODES_H__
-#define __ARM_COMPUTE_GRAPH_NODES_H__
+#ifndef ARM_COMPUTE_GRAPH_NODES_H
+#define ARM_COMPUTE_GRAPH_NODES_H
 
 #include "arm_compute/graph/nodes/ActivationLayerNode.h"
 #include "arm_compute/graph/nodes/BatchNormalizationLayerNode.h"
@@ -63,4 +63,4 @@
 #include "arm_compute/graph/nodes/UpsampleLayerNode.h"
 #include "arm_compute/graph/nodes/YOLOLayerNode.h"
 
-#endif /* __ARM_COMPUTE_GRAPH_NODES_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NODES_H */
diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h
index 42fe0d0..f41523b 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NODES_FWD_H__
-#define __ARM_COMPUTE_GRAPH_NODES_FWD_H__
+#ifndef ARM_COMPUTE_GRAPH_NODES_FWD_H
+#define ARM_COMPUTE_GRAPH_NODES_FWD_H
 
 namespace arm_compute
 {
@@ -70,4 +70,4 @@
 class YOLOLayerNode;
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NODES_FWD_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NODES_FWD_H */
diff --git a/arm_compute/graph/nodes/NormalizationLayerNode.h b/arm_compute/graph/nodes/NormalizationLayerNode.h
index 43040e1..3f5e781 100644
--- a/arm_compute/graph/nodes/NormalizationLayerNode.h
+++ b/arm_compute/graph/nodes/NormalizationLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -56,4 +56,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h
index 8704b9d..843ab96 100644
--- a/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h
+++ b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -45,4 +45,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/OutputNode.h b/arm_compute/graph/nodes/OutputNode.h
index 03d41eb..27902af 100644
--- a/arm_compute/graph/nodes/OutputNode.h
+++ b/arm_compute/graph/nodes/OutputNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_OUTPUT_NODE_H__
-#define __ARM_COMPUTE_GRAPH_OUTPUT_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_OUTPUT_NODE_H
+#define ARM_COMPUTE_GRAPH_OUTPUT_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -45,4 +45,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_OUTPUT_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_OUTPUT_NODE_H */
diff --git a/arm_compute/graph/nodes/PadLayerNode.h b/arm_compute/graph/nodes/PadLayerNode.h
index a14be02..7d40ae8 100644
--- a/arm_compute/graph/nodes/PadLayerNode.h
+++ b/arm_compute/graph/nodes/PadLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -57,4 +57,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_PAD_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/PermuteLayerNode.h b/arm_compute/graph/nodes/PermuteLayerNode.h
index b400926..555f2b5 100644
--- a/arm_compute/graph/nodes/PermuteLayerNode.h
+++ b/arm_compute/graph/nodes/PermuteLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -59,4 +59,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_PERMUTE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/PoolingLayerNode.h b/arm_compute/graph/nodes/PoolingLayerNode.h
index d037ea2..41342a8 100644
--- a/arm_compute/graph/nodes/PoolingLayerNode.h
+++ b/arm_compute/graph/nodes/PoolingLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -64,4 +64,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_POOLING_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/PriorBoxLayerNode.h b/arm_compute/graph/nodes/PriorBoxLayerNode.h
index 901fa08..f6cfa47 100644
--- a/arm_compute/graph/nodes/PriorBoxLayerNode.h
+++ b/arm_compute/graph/nodes/PriorBoxLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -64,4 +64,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_PRIORBOX_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/QuantizationLayerNode.h b/arm_compute/graph/nodes/QuantizationLayerNode.h
index 48f5f7c..f283c26 100644
--- a/arm_compute/graph/nodes/QuantizationLayerNode.h
+++ b/arm_compute/graph/nodes/QuantizationLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -53,4 +53,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/ROIAlignLayerNode.h b/arm_compute/graph/nodes/ROIAlignLayerNode.h
index 5c2af7d..4452468 100644
--- a/arm_compute/graph/nodes/ROIAlignLayerNode.h
+++ b/arm_compute/graph/nodes/ROIAlignLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H__
-#define __ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H
+#define ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H
 
 #include "arm_compute/core/Types.h"
 #include "arm_compute/graph/INode.h"
@@ -63,4 +63,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_ROI_ALIGN_NODE_H */
diff --git a/arm_compute/graph/nodes/ReorgLayerNode.h b/arm_compute/graph/nodes/ReorgLayerNode.h
index 1cc0698..86f6252 100644
--- a/arm_compute/graph/nodes/ReorgLayerNode.h
+++ b/arm_compute/graph/nodes/ReorgLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -64,4 +64,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_REORG_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/ReshapeLayerNode.h b/arm_compute/graph/nodes/ReshapeLayerNode.h
index 5161af8..57d399a 100644
--- a/arm_compute/graph/nodes/ReshapeLayerNode.h
+++ b/arm_compute/graph/nodes/ReshapeLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -51,4 +51,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_RESHAPE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/ResizeLayerNode.h b/arm_compute/graph/nodes/ResizeLayerNode.h
index 231e79e..93b4495 100644
--- a/arm_compute/graph/nodes/ResizeLayerNode.h
+++ b/arm_compute/graph/nodes/ResizeLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -60,4 +60,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_RESIZE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/SliceLayerNode.h b/arm_compute/graph/nodes/SliceLayerNode.h
index 861654e..7f3173e 100644
--- a/arm_compute/graph/nodes/SliceLayerNode.h
+++ b/arm_compute/graph/nodes/SliceLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -75,4 +75,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/SoftmaxLayerNode.h b/arm_compute/graph/nodes/SoftmaxLayerNode.h
index 6ace58d..c6990b1 100644
--- a/arm_compute/graph/nodes/SoftmaxLayerNode.h
+++ b/arm_compute/graph/nodes/SoftmaxLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -56,4 +56,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/SplitLayerNode.h b/arm_compute/graph/nodes/SplitLayerNode.h
index abd28ae..345260a 100644
--- a/arm_compute/graph/nodes/SplitLayerNode.h
+++ b/arm_compute/graph/nodes/SplitLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -77,4 +77,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_SPLIT_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/StackLayerNode.h b/arm_compute/graph/nodes/StackLayerNode.h
index 6c83fe2..52632f5 100644
--- a/arm_compute/graph/nodes/StackLayerNode.h
+++ b/arm_compute/graph/nodes/StackLayerNode.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -66,4 +66,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_STACK_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/UpsampleLayerNode.h b/arm_compute/graph/nodes/UpsampleLayerNode.h
index 38afabe..cdaf206 100644
--- a/arm_compute/graph/nodes/UpsampleLayerNode.h
+++ b/arm_compute/graph/nodes/UpsampleLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -71,4 +71,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_UPSAMPLE_LAYER_NODE_H */
diff --git a/arm_compute/graph/nodes/YOLOLayerNode.h b/arm_compute/graph/nodes/YOLOLayerNode.h
index 0e02c37..22e0cf5 100644
--- a/arm_compute/graph/nodes/YOLOLayerNode.h
+++ b/arm_compute/graph/nodes/YOLOLayerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H__
-#define __ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H__
+#ifndef ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H
+#define ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H
 
 #include "arm_compute/graph/INode.h"
 
@@ -63,4 +63,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H__ */
+#endif /* ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H */
diff --git a/arm_compute/graph/printers/DotGraphPrinter.h b/arm_compute/graph/printers/DotGraphPrinter.h
index c28a17b..c763cb1 100644
--- a/arm_compute/graph/printers/DotGraphPrinter.h
+++ b/arm_compute/graph/printers/DotGraphPrinter.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H__
-#define __ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H__
+#ifndef ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H
+#define ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H
 
 #include "arm_compute/graph/IGraphPrinter.h"
 
@@ -104,4 +104,4 @@
 };
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H__ */
+#endif /* ARM_COMPUTE_GRAPH_DOTGRAPHPRINTER_H */
diff --git a/arm_compute/graph/printers/Printers.h b/arm_compute/graph/printers/Printers.h
index 935e2bb..631b634 100644
--- a/arm_compute/graph/printers/Printers.h
+++ b/arm_compute/graph/printers/Printers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef __ARM_COMPUTE_GRAPH_PRINTERS_H__
-#define __ARM_COMPUTE_GRAPH_PRINTERS_H__
+#ifndef ARM_COMPUTE_GRAPH_PRINTERS_H
+#define ARM_COMPUTE_GRAPH_PRINTERS_H
 
 #include "arm_compute/graph/printers/DotGraphPrinter.h"
 
-#endif /* __ARM_COMPUTE_GRAPH_PRINTERS_H__ */
+#endif /* ARM_COMPUTE_GRAPH_PRINTERS_H */