diff --git a/common/src/main/resources/jdbc.properties b/common/src/main/resources/jdbc.properties
index 4f234e94..9c8481f5 100644
--- a/common/src/main/resources/jdbc.properties
+++ b/common/src/main/resources/jdbc.properties
@@ -54,13 +54,13 @@ UNSUPPORTED_USER_DEFINED_TYPES=User-defined types are not supported.
 UNSUPPORTED_VERSION_COLUMNS=Version columns are not supported.
 
 ### Error is unlikely, however if it occurs it may indicate issue in JDBC driver
-CANNOT_UNWRAP=Cannot unwrap class to '%s. Please report issue to Amazon DocumentDB.'
-CANNOT_RETRIEVE_COLUMN=Cannot retrieve the value for column: %s. Metadata or query result may be malformed. Please report issue to Amazon DocumentDB.
-DELETE_SCHEMA_FAILED=Failed to delete database schema '%s'. Please report issue to Amazon DocumentDB.
-DELETE_TABLE_SCHEMA_FAILED=Failed to delete one or more table schema. Please report issue to Amazon DocumentDB.
-INVALID_COLUMN_LABEL=Unknown column label: %s. Please report issue to Amazon DocumentDB.
-INVALID_STATE_SET_TABLE_FUNCTION=This method must only be called once after loading schema. Please report issue to Amazon DocumentDB.
-UPSERT_SCHEMA_FAILED=Failed to insert or update one or more records for schema '%s'. Please report issue to Amazon DocumentDB.
+CANNOT_UNWRAP=Cannot unwrap class to '%s. Please report the issue to AWS support.'
+CANNOT_RETRIEVE_COLUMN=Cannot retrieve the value for column: %s. Metadata or query result may be malformed. Please report the issue to AWS support.
+DELETE_SCHEMA_FAILED=Failed to delete database schema '%s'. Please report the issue to AWS support.
+DELETE_TABLE_SCHEMA_FAILED=Failed to delete one or more table schema. Please report the issue to AWS support.
+INVALID_COLUMN_LABEL=Unknown column label: %s. Please report the issue to AWS support.
+INVALID_STATE_SET_TABLE_FUNCTION=This method must only be called once after loading schema. Please report the issue to AWS support.
+UPSERT_SCHEMA_FAILED=Failed to insert or update one or more records for schema '%s'. Please report the issue to AWS support.
 
 ### Typical Error Messages (may occur in BI tools)
 SQL_PARSE_ERROR=Unable to parse SQL '%s'.%n Reason: '%s'