diff --git a/filter-plugin/logstash-filter-yugabyte-guardium/YugabyteOverSyslogPackage/YugabyteDB/filter.conf b/filter-plugin/logstash-filter-yugabyte-guardium/YugabyteOverSyslogPackage/YugabyteDB/filter.conf
index bc767fd22..5adddced4 100644
--- a/filter-plugin/logstash-filter-yugabyte-guardium/YugabyteOverSyslogPackage/YugabyteDB/filter.conf
+++ b/filter-plugin/logstash-filter-yugabyte-guardium/YugabyteOverSyslogPackage/YugabyteDB/filter.conf
@@ -126,7 +126,7 @@ filter {
               mutate {
                   add_field => {
                       "serverHost" => "%{server_hostname}"
-                      "serverOS" => "NA"
+                      "serverOS" => "N.A."
                       "serverIP" => "%{server_ip}"
                   }
               }
diff --git a/filter-plugin/logstash-filter-yugabyte-guardium/src/main/java/com/ibm/guardium/yugabytedb/Constants.java b/filter-plugin/logstash-filter-yugabyte-guardium/src/main/java/com/ibm/guardium/yugabytedb/Constants.java
index 1de46ff5a..542128872 100644
--- a/filter-plugin/logstash-filter-yugabyte-guardium/src/main/java/com/ibm/guardium/yugabytedb/Constants.java
+++ b/filter-plugin/logstash-filter-yugabyte-guardium/src/main/java/com/ibm/guardium/yugabytedb/Constants.java
@@ -9,7 +9,7 @@
 
 public class Constants {
 
-	public static final String NOT_AVAILABLE= "NA";
+	public static final String NOT_AVAILABLE= "N.A.";
 	public static final String UNKNOWN_STRING = StringUtils.EMPTY;
 	public static final String LOGSTASH_TAG_JSON_PARSE_ERROR = "_yugabyteguardium_json_parse_error";
 
@@ -50,9 +50,9 @@ public class Constants {
 
 	public static final String LANGUAGE_CASSANDRA = "CASS";
 
-	public static final String DB_PROTOCOL_PG = "POSTGRESQL";
+	public static final String DB_PROTOCOL_PG = "YUGABYTE";
 
-	public static final String DB_PROTOCOL_CASSANDRA = "CASSANDRA";
+	public static final String DB_PROTOCOL_CASSANDRA = "YUGABYTE_CASS";
 	public static final String MESSAGE = "message";
 
 	public static final String TYPE = "log_type";