diff --git a/.automation/test/cpp/README.md b/.automation/test/cpp/README.md
index 7ef6604f..6d66ca83 100644
--- a/.automation/test/cpp/README.md
+++ b/.automation/test/cpp/README.md
@@ -1,6 +1,6 @@
 # Clang Test Cases
 
-This folder holds the test cases for **Clang**.
+This folder holds the test cases for **C/C++**.
 
 ## Additional Docs
 
diff --git a/Dockerfile b/Dockerfile
index 064fb56c..30046175 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -296,7 +296,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repo
     && find /usr/ -type f -name '*.md' -exec rm {} +
 
 ################################################################################
-# Build the clang binary #######################################################
+# Build the clang-format binary ################################################
 ################################################################################
 FROM alpine:3.14.0 as clang-format-build
 
diff --git a/Dockerfile-slim b/Dockerfile-slim
index d19d3ffc..e69a4fd5 100644
--- a/Dockerfile-slim
+++ b/Dockerfile-slim
@@ -234,7 +234,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repo
     && find /usr/ -type f -name '*.md' -exec rm {} +
 
 ################################################################################
-# Build the clang binary #######################################################
+# Build the clang-form binary ##################################################
 ################################################################################
 FROM alpine:3.14.0 as clang-format-build
 
diff --git a/README.md b/README.md
index b38322de..8322c353 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,8 @@ Developers on **GitHub** can call the **GitHub Action** to lint their code base
 | **Ansible**                      | [ansible-lint](https://github.com/ansible/ansible-lint)                                                                                                                       |
 | **Azure Resource Manager (ARM)** | [arm-ttk](https://github.com/azure/arm-ttk)                                                                                                                                   |
 | **AWS CloudFormation templates** | [cfn-lint](https://github.com/aws-cloudformation/cfn-python-lint/)                                                                                                            |
-| **C++**                          | [cpp-lint](https://github.com/cpplint/cpplint) / [clang](https://github.com/llvm/llvm-project.git)                                                                            |
-| **C#**                           | [dotnet-format](https://github.com/dotnet/format) / [clang](https://github.com/llvm/llvm-project.git)                                                                         |
+| **C++**                          | [cpp-lint](https://github.com/cpplint/cpplint) / [clang-format](https://github.com/llvm/llvm-project.git)                                                                            |
+| **C#**                           | [dotnet-format](https://github.com/dotnet/format) / [clang-format](https://github.com/llvm/llvm-project.git)                                                                         |
 | **CSS**                          | [stylelint](https://stylelint.io/)                                                                                                                                            |
 | **Clojure**                      | [clj-kondo](https://github.com/borkdude/clj-kondo)                                                                                                                            |
 | **CoffeeScript**                 | [coffeelint](https://coffeelint.github.io/)                                                                                                                                   |
@@ -317,7 +317,7 @@ But if you wish to select or exclude specific linters, we give you full control
 | **VALIDATE_BASH**                  | `true`                          | Flag to enable or disable the linting process of the Bash language.                                                                                                                                                  |
 | **VALIDATE_BASH_EXEC**             | `true`                          | Flag to enable or disable the linting process of the Bash language to validate if file is stored as executable.                                                                                                      |
 | **VALIDATE_CPP**                   | `true`                          | Flag to enable or disable the linting process of the C++ language.                                                                                                                                                   |
-| **VALIDATE_CLANG_FORMAT**          | `true`                          | Flag to enable or disable the linting process of the C++/C language with clang.                                                                                                                                      |
+| **VALIDATE_CLANG_FORMAT**          | `true`                          | Flag to enable or disable the linting process of the C++/C language with clang-format.                                                                                                                               |
 | **VALIDATE_CLOJURE**               | `true`                          | Flag to enable or disable the linting process of the Clojure language.                                                                                                                                               |
 | **VALIDATE_CLOUDFORMATION**        | `true`                          | Flag to enable or disable the linting process of the AWS Cloud Formation language.                                                                                                                                   |
 | **VALIDATE_COFFEESCRIPT**          | `true`                          | Flag to enable or disable the linting process of the Coffeescript language.                                                                                                                                          |