diff --git a/src/odbc/include/ignite/odbc/jni/documentdb_connection_properties.h b/src/odbc/include/ignite/odbc/jni/documentdb_connection_properties.h
index e006dd110..e83d807ea 100644
--- a/src/odbc/include/ignite/odbc/jni/documentdb_connection_properties.h
+++ b/src/odbc/include/ignite/odbc/jni/documentdb_connection_properties.h
@@ -34,7 +34,7 @@ namespace ignite {
 namespace odbc {
 namespace jni {
 /**
- * Wrapper for the the JDBC DatabaseMetaData.
+ * Wrapper for the the DocumentDB connection properties.
  */
 class DocumentDbConnectionProperties {
   friend class DocumentDbConnection;
@@ -45,7 +45,7 @@ class DocumentDbConnectionProperties {
 
  private:
   /**
-   * Constructs an instance of the DatabaseMetaData class.
+   * Constructs an instance of the DocumentDbConnectionProperties class.
    */
   DocumentDbConnectionProperties(
       SharedPointer< JniContext >& jniContext,
@@ -56,7 +56,7 @@ class DocumentDbConnectionProperties {
   /** The JNI context */
   SharedPointer< JniContext > _jniContext;
 
-  /** The DatabaseMetaData Java object  */
+  /** The DocumentDbConnectionProperties Java object  */
   SharedPointer< GlobalJObject > _connectionProperties;
 };
 }  // namespace jni
diff --git a/src/odbc/include/ignite/odbc/jni/documentdb_database_metadata.h b/src/odbc/include/ignite/odbc/jni/documentdb_database_metadata.h
index 32802bf20..07bc84f40 100644
--- a/src/odbc/include/ignite/odbc/jni/documentdb_database_metadata.h
+++ b/src/odbc/include/ignite/odbc/jni/documentdb_database_metadata.h
@@ -34,7 +34,7 @@ namespace ignite {
 namespace odbc {
 namespace jni {
 /**
- * Wrapper for the the JDBC DatabaseMetaData.
+ * Wrapper for the the DocumentDB database metadata.
  */
 class DocumentDbDatabaseMetadata {
   friend class DocumentDbConnection;
@@ -42,13 +42,13 @@ class DocumentDbDatabaseMetadata {
 
  public:
   /**
-   * Desctructs a DocumentDbDatabaseMetadata instance.
+   * Destructs a DocumentDbDatabaseMetadata instance.
    */
   ~DocumentDbDatabaseMetadata() = default;
 
  private:
   /**
-   * Constructs an instance of the DatabaseMetaData class.
+   * Constructs an instance of the DocumentDbDatabaseMetadata class.
    */
   DocumentDbDatabaseMetadata(
       SharedPointer< JniContext >& jniContext,
@@ -59,7 +59,7 @@ class DocumentDbDatabaseMetadata {
   /** The JNI context */
   SharedPointer< JniContext > _jniContext;
 
-  /** The DatabaseMetaData Java object  */
+  /** The DocumentDbDatabaseMetadata Java object  */
   SharedPointer< GlobalJObject > _databaseMetadata;
 };
 }  // namespace jni
diff --git a/src/odbc/include/ignite/odbc/jni/documentdb_query_mapping_service.h b/src/odbc/include/ignite/odbc/jni/documentdb_query_mapping_service.h
index 48207bd24..6eec17ef3 100644
--- a/src/odbc/include/ignite/odbc/jni/documentdb_query_mapping_service.h
+++ b/src/odbc/include/ignite/odbc/jni/documentdb_query_mapping_service.h
@@ -38,7 +38,7 @@ namespace ignite {
 namespace odbc {
 namespace jni {
 /**
- * Wrapper for the the JDBC DatabaseMetaData.
+ * Wrapper for the the DocumentDB query mapping service.
  */
 class DocumentDbQueryMappingService {
  public:
@@ -66,7 +66,7 @@ class DocumentDbQueryMappingService {
 
  private:
   /**
-   * Constructs an instance of the DatabaseMetaData class.
+   * Constructs an instance of the DocumentDbQueryMappingService class.
    */
   DocumentDbQueryMappingService(SharedPointer< JniContext >& jniContext,
                             SharedPointer< GlobalJObject >& queryMappingService)
@@ -86,7 +86,7 @@ class DocumentDbQueryMappingService {
   /** The JNI context */
   SharedPointer< JniContext > _jniContext;
 
-  /** The DatabaseMetaData Java object  */
+  /** The DocumentDbQueryMappingService Java object  */
   SharedPointer< GlobalJObject > _queryMappingService;
 };
 }  // namespace jni
diff --git a/src/odbc/include/ignite/odbc/jni/jdbc_column_metadata.h b/src/odbc/include/ignite/odbc/jni/jdbc_column_metadata.h
index f4390aef8..486fe8ad6 100644
--- a/src/odbc/include/ignite/odbc/jni/jdbc_column_metadata.h
+++ b/src/odbc/include/ignite/odbc/jni/jdbc_column_metadata.h
@@ -37,7 +37,7 @@ namespace ignite {
 namespace odbc {
 namespace jni {
 /**
- * Wrapper for the the JDBC DatabaseMetaData.
+ * Wrapper for the the JDBC column metadata.
  */
 class JdbcColumnMetadata {
   friend class DocumentDbConnection;
@@ -199,7 +199,7 @@ class JdbcColumnMetadata {
 
  private:
   /**
-   * Constructs an instance of the DatabaseMetaData class.
+   * Constructs an instance of the JdbcColumnMetadata class.
    */
   JdbcColumnMetadata(int32_t ordinal, bool autoIncrement, bool caseSensitive,
                      bool searchable, bool currency, int32_t nullable,