diff --git a/extended/__init__.robot b/extended/__init__.robot
index af6b920..4b80a4f 100755
--- a/extended/__init__.robot
+++ b/extended/__init__.robot
@@ -9,7 +9,7 @@
 
 Suite Setup      System Driver Data
 
-*** Keyword ***
+*** Keywords ***
 
 System Driver Data
     [Documentation]  System driver information.
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index b5927ae..ed3cd67 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -190,7 +190,7 @@
     END
 
 
-*** Comment ***
+*** Comments ***
 
 Get Concurrent Root Certificate Request From Operator Users
     [Documentation]  Get multiple concurrent root certificate from non admin users and verify no errors.
@@ -222,7 +222,7 @@
     END
 
 
-*** Comment ***
+*** Comments ***
 
 Get Concurrent Root Certificate Request From Different Non Admin Users
     [Documentation]  Get multiple concurrent root certificate from different non admin users
@@ -363,7 +363,7 @@
     END
 
 
-*** Comment ***
+*** Comments ***
 
 Send Concurrent CSR Request From Non Admin Users And Verify
     [Documentation]  Send concurrent csr request from non admin users
@@ -536,7 +536,7 @@
     END
 
 
-*** Comment ***
+*** Comments ***
 
 Get Root Certificate And Send CSR Requests From Admin And Operator Concurrently And Verify
     [Documentation]  Get root certificate from admin and send csr requests
diff --git a/openpower/ras/__init__.robot b/openpower/ras/__init__.robot
index c48017c..18bf364 100755
--- a/openpower/ras/__init__.robot
+++ b/openpower/ras/__init__.robot
@@ -9,7 +9,7 @@
 
 Suite Setup      Log System Driver Data
 
-*** Keyword ***
+*** Keywords ***
 
 Log System Driver Data
     [Documentation]  Log system driver information.
diff --git a/xcat/__init__.robot b/xcat/__init__.robot
index 55b2776..5b796e1 100755
--- a/xcat/__init__.robot
+++ b/xcat/__init__.robot
@@ -9,7 +9,7 @@
 
 Suite Setup      Log System Driver Data
 
-*** Keyword ***
+*** Keywords ***
 
 Log System Driver Data
     [Documentation]  Log system driver information.