diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CommentsManager.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CommentsManager.java
index ab2b2b59d9b..6428f11ceb4 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CommentsManager.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CommentsManager.java
@@ -45,12 +45,12 @@ public interface CommentsManager {
     /**
      * To validate the pre-request of the comment
      *
-     * @param CommentId ID of the comment.
+     * @param commentId ID of the comment.
      * @param comment   comment needed to be validate.
      * @return validated the comment.
      * @throws CommentManagementException Exceptions of the comment management.
      */
-    Boolean validateComment(int CommentId, String comment) throws CommentManagementException;
+    Boolean validateComment(int commentId, String comment) throws CommentManagementException;
 
     /**
      * Get all comments to pagination
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/CommentDAO.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/CommentDAO.java
index 4ef62e3e8cd..90e36007441 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/CommentDAO.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/CommentDAO.java
@@ -206,8 +206,8 @@ import java.util.List;
      *
      * @param modifiedBy Username of the modified person.
      * @param modifiedAt time of the modification
-     * @return List of comments
-     * @throws {@link                List}CommentManagementException Exceptions of the comment management.
+     * @return {@link List}List of comments
+     * @throws CommentManagementException Exceptions of the comment management.
      * @throws DBConnectionException db connection exception.
      * @throws SQLException          sql exception
      */
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/CommentsManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/CommentsManagerImpl.java
index ad01b692e47..0b75c69f66c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/CommentsManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/CommentsManagerImpl.java
@@ -86,21 +86,21 @@ public class CommentsManagerImpl implements CommentsManager {
     /**
      * To validate the pre-request of the comment
      *
-     * @param CommentId ID of the comment.
+     * @param commentId ID of the comment.
      * @param comment   comment needed to be validate.
      * @return Application related with the UUID.
      * @throws CommentManagementException Exceptions of the comment management.
      */
 
-    public Boolean validateComment(int CommentId, String comment) throws CommentManagementException {
+    public Boolean validateComment(int commentId, String comment) throws CommentManagementException {
 
-        if (CommentId <= 0) {
+        if (commentId <= 0) {
             throw new CommentManagementException(
                     "Comment ID is null or negative. Comment id is a required parameter to get the "
                             + "relevant comment.");
         }
         if (comment == null) {
-            log.error("Comment can not be null, but Comment at comment id " + CommentId + " is null.");
+            log.error("Comment can not be null, but Comment at comment id " + commentId + " is null.");
             return false;
         }
         return true;