diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java
index 0608edb75..770dd9030 100644
--- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java
+++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java
@@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
           failureCollector,
           cloudsqlMysqlActionConfig.instanceType,
-          cloudsqlMysqlActionConfig.connectionName);
+          cloudsqlMysqlActionConfig.connectionName,
+          CloudSQLUtil.CLOUDSQL_MYSQL);
     }
     
     super.configurePipeline(pipelineConfigurer);
diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java
index da1414ff3..6cd1b0031 100644
--- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java
+++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java
@@ -74,7 +74,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlMysqlSinkConfig.connection.getInstanceType(),
-        cloudsqlMysqlSinkConfig.connection.getConnectionName());
+        cloudsqlMysqlSinkConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_MYSQL);
     }
     
     super.configurePipeline(pipelineConfigurer);
diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java
index 8273169c0..201360c67 100644
--- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java
+++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java
@@ -70,7 +70,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlMysqlSourceConfig.connection.getInstanceType(),
-        cloudsqlMysqlSourceConfig.connection.getConnectionName());
+        cloudsqlMysqlSourceConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_MYSQL);
     }
 
     super.configurePipeline(pipelineConfigurer);
diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java
index 1a3f8ad7b..5b13759f6 100644
--- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java
+++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java
@@ -55,7 +55,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
           failureCollector,
           cloudsqlPostgresqlActionConfig.instanceType,
-          cloudsqlPostgresqlActionConfig.connectionName);
+          cloudsqlPostgresqlActionConfig.connectionName,
+          CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
     
     super.configurePipeline(pipelineConfigurer);
diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java
index 65b86366c..060b67f82 100644
--- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java
+++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java
@@ -81,7 +81,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlPostgresqlSinkConfig.connection.getInstanceType(),
-        cloudsqlPostgresqlSinkConfig.connection.getConnectionName());
+        cloudsqlPostgresqlSinkConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
     
     super.configurePipeline(pipelineConfigurer);
diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java
index e32651a9a..db3f2d708 100644
--- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java
+++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java
@@ -70,7 +70,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
       CloudSQLUtil.checkConnectionName(
         failureCollector,
         cloudsqlPostgresqlSourceConfig.connection.getInstanceType(),
-        cloudsqlPostgresqlSourceConfig.connection.getConnectionName());
+        cloudsqlPostgresqlSourceConfig.connection.getConnectionName(),
+        CloudSQLUtil.CLOUDSQL_POSTGRESQL);
     }
     
     super.configurePipeline(pipelineConfigurer);
diff --git a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java
index 11595ac06..f704f2ad5 100644
--- a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java
+++ b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java
@@ -31,6 +31,9 @@ public class CloudSQLUtil {
   public static final String INSTANCE_TYPE = "instanceType";
   public static final String PUBLIC_INSTANCE = "public";
   public static final String PRIVATE_INSTANCE = "private";
+  public static final String CLOUDSQL_POSTGRESQL = "CloudSQL PostgreSQL";
+  public static final String CLOUDSQL_MYSQL = "CloudSQL MySQL";
+
 
   /**
    * Utility method to check the Connection Name format of a CloudSQL instance.
@@ -38,9 +41,10 @@ public class CloudSQLUtil {
    * @param failureCollector {@link FailureCollector} for the pipeline
    * @param instanceType CloudSQL instance type
    * @param connectionName Connection Name for the CloudSQL instance
+   * @param databaseType Type of CloudSQL instance- CloudSQL PostgreSQL, CLoudSQL MySQL
    */
   public static void checkConnectionName(
-    FailureCollector failureCollector, String instanceType, String connectionName) {
+    FailureCollector failureCollector, String instanceType, String connectionName, String databaseType) {
 
     if (PUBLIC_INSTANCE.equalsIgnoreCase(instanceType)) {
       Pattern connectionNamePattern =
@@ -50,16 +54,16 @@ public static void checkConnectionName(
       if (!matcher.matches()) {
         failureCollector
           .addFailure(
-            "Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to "
-              + "a public CloudSQL PostgreSQL instance.", null)
+            String.format("Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to "
+              + "a public %s instance.", databaseType), null)
           .withConfigProperty(CONNECTION_NAME);
       }
     } else {
       if (!InetAddresses.isInetAddress(connectionName)) {
         failureCollector
           .addFailure(
-            "Enter the internal IP address of the Compute Engine VM cloudsql proxy "
-              + "is running on, to connect to a private CloudSQL PostgreSQL instance.", null)
+            String.format("Enter the internal IP address of the Compute Engine VM cloudsql proxy "
+              + "is running on, to connect to a private %s instance.", databaseType), null)
           .withConfigProperty(CONNECTION_NAME);
       }
     }