opensearch-project · dai-chen · May 18, 2021 · May 17, 2021 · May 17, 2021 · May 17, 2021
diff --git a/sql-odbc/.gitignore b/sql-odbc/.gitignore
@@ -42,8 +42,8 @@ LICENSE.txt
 /googletest/
 /installer/
 /IntegrationTests/
-/odfeenlist/
-/odfesqlodbc/
+/opensearchenlist/
+/sqlodbc/
 /PerformanceTests/
 /UnitTests/
 *.filters

diff --git a/sql-odbc/README.md b/sql-odbc/README.md
@@ -16,8 +16,8 @@ The driver is compatible with ODBC 3.51.
 
 ## Connectors
 
-* **Power BI Desktop**: [`OdfeSqlOdbcPBIConnector.mez`](./src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez)
-* **Tableau**: [`odfe_sql_odbc.taco`](./src/TableauConnector/odfe_sql_odbc/odfe_sql_odbc.taco)
+* **Power BI Desktop**: [`SqlOdbcPBIConnector.mez`](./src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez)
+* **Tableau**: [`opensearch_sql_odbc.taco`](./src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco)
 
 ## Installing the Driver
 
@@ -48,8 +48,8 @@ This will customize the connection from Tableau to OpenSearch, ensuring that the
 ## Using the Driver
 
 The driver comes in the form of a library file:
-* Windows: `odfesqlodbc.dll`
-* Mac: `libodfesqlodbc.dylib`
+* Windows: `sqlodbc.dll`
+* Mac: `libsqlodbc.dylib`
 
 If using with ODBC compatible BI tools, refer to the tool documentation on configuring a new ODBC driver. In most cases, you will need to make the tool aware of the location of the driver library file and then use it to setup OpenSearch database connections.
 

diff --git a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md
@@ -40,7 +40,7 @@ build
   └-- install
 ```
 
-* Driver DLL: `.\build\odbc\bin\<Config>\odfesqlodbc.dll`
+* Driver DLL: `.\build\odbc\bin\<Config>\sqlodbc.dll`
 * Test binaries folder: `.\build\odbc\bin\<Config>\`
 
 ### Packaging
@@ -84,7 +84,7 @@ build
   └-- <build files>
 ```
 
-* Driver library: `./build/odbc/lib/libodfesqlodbc.dylib`
+* Driver library: `./build/odbc/lib/libsqlodbc.dylib`
 * Test binaries folder: `./build/odbc/bin/`
 
 ### Packaging

diff --git a/sql-odbc/docs/dev/run_tests.md b/sql-odbc/docs/dev/run_tests.md
@@ -10,7 +10,7 @@
 
 Loading a dataset requires an [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/) service running with [OpenSearch Dashboards](https://opendistro.github.io/for-elasticsearch-docs/docs/kibana/). If either of these are missing, please refer to the documentation on how to set them up.
 
-Note, if you wish to work with SSL/TLS, you need to configure ODFE and OpenSearch Dashboards to support it. See the [build instructions](./BUILD_INSTRUCTIONS.md) for more info.
+Note, if you wish to work with SSL/TLS, you need to configure OpenSearch and OpenSearch Dashboards to support it. See the [build instructions](./BUILD_INSTRUCTIONS.md) for more info.
 
 First load the sample datasets provided by OpenSearch Dashboards.
 

diff --git a/sql-odbc/docs/user/mac_configure_dsn.md b/sql-odbc/docs/user/mac_configure_dsn.md
@@ -12,8 +12,8 @@ Note: In order to use the OpenSearch SQL ODBC driver with the [Tableau Connector
 1. Go to the **ODBC Drivers** tab.
 2. Click **Add a Driver**.
 	* **Description of the Driver**: The driver name used for ODBC connections (ex. `OpenSearch SQL ODBC Driver`)
-	* **Driver File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libodfesqlodbc.dylib`)
-	* **Setup File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libodfesqlodbc.dylib`)
+	* **Driver File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`)
+	* **Setup File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`)
 	* Set as a **User** driver
     * Below is a screenshot of how the final screen should look.
 3. Click **OK** to save the options.
@@ -53,16 +53,16 @@ Try the following:
     <Driver Name> = Installed
 
     [<Driver Name>]
-    Driver = <odbc-root>/lib64/libodfesqlodbc.dylib
-    Setup = <odbc-root>/lib64/libodfesqlodbc.dylib
+    Driver = <odbc-root>/lib64/libsqlodbc.dylib
+    Setup = <odbc-root>/lib64/libsqlodbc.dylib
 	```
    * **odbc.ini** (will be found in **User DSNs**)
 	```ini
 	[ODBC Data Sources]  
     <DSN Name> = <Driver Name>
 
     [<DSN Name>]
-    Driver = <odbc-root>/lib64/libodfesqlodbc.dylib
+    Driver = <odbc-root>/lib64/libsqlodbc.dylib
     Description =
     Host = localhost
     Port = 9200

diff --git a/sql-odbc/docs/user/microsoft_excel_support_mac.md b/sql-odbc/docs/user/microsoft_excel_support_mac.md
@@ -50,7 +50,7 @@
 <img src="img/excel_table_list.png" width="500">
 
 * Edit SQL statement if required and click on **Run**. Data preview will be loaded.
-> **NOTE**: Excel for Mac currently will not show an error if you provide an incorrect query ([Github issue here](https://github.com/opendistro-for-elasticsearch/sql/issues/601)). If no data appears, check your ODFE server logs to see if the query failed.
+> **NOTE**: Excel for Mac currently will not show an error if you provide an incorrect query ([Github issue here](https://github.com/opendistro-for-elasticsearch/sql/issues/601)). If no data appears, check your OpenSearch server logs to see if the query failed.
 
 <img src="img/excel_data_preview_mac.png">
 

diff --git a/sql-odbc/docs/user/power_bi_support.md b/sql-odbc/docs/user/power_bi_support.md
@@ -4,11 +4,11 @@
 * Microsoft Power BI Desktop
 * [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/)
 * [OpenSearch SQL ODBC driver](https://opendistro.github.io/for-elasticsearch-docs/docs/sql/odbc/)
-* [OdfeSqlOdbcPBIConnector.mez](../../src/PowerBIConnector/bin/Release/) 
-* Optional: [odfesqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server 
+* [SqlOdbcPBIConnector.mez](../../src/PowerBIConnector/bin/Release/) 
+* Optional: [sqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server 
 
 ## Setup
-* Copy `OdfeSqlOdbcPBIConnector.mez` file in the `<User>\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector.
+* Copy `SqlOdbcPBIConnector.mez` file in the `<User>\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector.
 * Open Power BI Desktop.
 * Change the security settings. Click on **Files** > **Options and settings** > **Options** > **Security** > Select **Allow any extension to load without validation or warning** for Data Extensions. This will allow the custom connector to load data into Power BI.
 
@@ -56,14 +56,14 @@
 
 More info: https://docs.microsoft.com/en-us/power-bi/connect-data/desktop-data-sources#using-pbids-files-to-get-data
 
-Example PBIDS file for OpenSearch: (available here: [odfesqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids))
+Example PBIDS file for OpenSearch: (available here: [sqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids))
 ```json
 {
     "version": "0.1",
     "connections": [
         {
             "details": {
-                "protocol": "odfesqlodbc",
+                "protocol": "sqlodbc",
                 "address": {
                     "server": "localhost:9200"
                 }
@@ -74,12 +74,12 @@ Example PBIDS file for OpenSearch: (available here: [odfesqlodbc_import.pbids](.
 }
 ```
 
-The only part you should change is the `server` attribute, to point to the location of your ODFE server.
-* For AWS connections, this will be the full path of your ODFE instance (ex: `https://aws-odfe-instance.us-west-1.com`).
+The only part you should change is the `server` attribute, to point to the location of your OpenSearch server.
+* For AWS connections, this will be the full path of your OpenSearch instance (ex: `https://aws-opensearch-instance.us-west-1.com`).
 * Otherwise, this will be the `host:port` combination for your instance (ex: `localhost:9200`).
 
 Save this as a `.pbids` file. Double-click on it to open up your connection in Power BI Desktop.
-It will take you straight to the **Navigator** window for selecting the tables from the ODFE server.
+It will take you straight to the **Navigator** window for selecting the tables from the OpenSearch server.
 * If this is the first time you are connecting to this instance, you will be prompted for your credentials.
 
 <img src="img/pbi_auth.png" width="500">

diff --git a/sql-odbc/docs/user/tableau_support.md b/sql-odbc/docs/user/tableau_support.md
@@ -9,13 +9,13 @@ Connect an OpenSearch data source to Tableau Desktop via the Tableau Connector t
 * Download and Install [Tableau Desktop](https://www.tableau.com/products/desktop/download) 2020 and higher
 * Install and Configure [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/)
 * Download and Install [OpenSearch SQL ODBC driver](../../README.md)
-* Download Tableau Connector for `SQL by Open Distro for ES` ([odfe_sql_odbc.taco](../../src/TableauConnector/odfe_sql_odbc/odfe_sql_odbc.taco)).
-Click on **Download** option for downloading `odfe_sql_odbc.taco` file.
+* Download Tableau Connector for `SQL by Open Distro for ES` ([opensearch_sql_odbc.taco](../../src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco)).
+Click on **Download** option for downloading `opensearch_sql_odbc.taco` file.
 <img src="img/tableau_download_taco.png" >
 
 ## Prepare data 
 
-* Copy `odfe_sql_odbc.taco` file to My Tableau Repository.
+* Copy `opensearch_sql_odbc.taco` file to My Tableau Repository.
 
   * On windows: **%User%/Documents/My Tableau Repository/Connectors/**.
   * On Mac: **~/Documents/My Tableau Repository/Connectors/**.

diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
@@ -78,8 +78,8 @@ endif()
 
 # Base directories
 set(PROJECT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/..")
-set(ODFEODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/odfesqlodbc")
-set(ODFEENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/odfeenlist")
+set(OPENSEARCHODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/sqlodbc")
+set(OPENSEARCHENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/opensearchenlist")
 set(INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/IntegrationTests")
 set(UNIT_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/UnitTests")
 set(LIBRARY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libraries)
@@ -170,8 +170,8 @@ endif()
 if (APPLE)
 	add_subdirectory(${aws-cpp-sdk-base})
 endif()
-add_subdirectory(${ODFEODBC_SRC})
-add_subdirectory(${ODFEENLIST_SRC})
+add_subdirectory(${OPENSEARCHODBC_SRC})
+add_subdirectory(${OPENSEARCHENLIST_SRC})
 add_subdirectory(${INSTALL_SRC})
 
 # Only build & package DSN installer for Mac platforms

diff --git a/sql-odbc/src/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp
@@ -40,9 +40,9 @@
 using namespace std::string_literals;
 
 std::wstring driver_name = L"OpenSearch SQL ODBC Driver";
-std::wstring driver_filename = L"libodfesqlodbc.dylib";
+std::wstring driver_filename = L"libsqlodbc.dylib";
 std::wstring dsn_name = L"OpenSearch SQL ODBC DSN";
-std::wstring dsn_ini_filename = L"odfesqlodbc.ini";
+std::wstring dsn_ini_filename = L"sqlodbc.ini";
 
 std::wstring driver_name_placeholder = L"%DRIVER_NAME%";
 std::wstring driver_path_placeholder = L"%DRIVER_PATH%";

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
@@ -28,7 +28,7 @@ project(itodbc_aws_auth)
 set(SOURCE_FILES test_odbc_aws_auth.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}
 						${AWSSDK_INCLUDE_DIR}
 						)
@@ -37,5 +37,5 @@ include_directories(	${UT_HELPER}
 add_executable(itodbc_aws_auth ${SOURCE_FILES})
 
 # Library dependencies
-target_link_libraries(itodbc_aws_auth odfesqlodbc itodbc_helper ut_helper gtest_main aws-cpp-sdk-core)
+target_link_libraries(itodbc_aws_auth sqlodbc itodbc_helper ut_helper gtest_main aws-cpp-sdk-core)
 target_compile_definitions(itodbc_aws_auth PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg
@@ -4,8 +4,8 @@ Windows Registry Editor Version 5.00
 "OpenSearchODBC"="Installed"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
-"Driver"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
-"Setup"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
+"Driver"="<project-root>\\bin64\\Release\\sqlodbc.dll"
+"Setup"="<project-root>\\bin64\\Release\\sqlodbc.dll"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
 "test_aws_auth_dsn"="OpenSearchODBC"

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini
@@ -2,5 +2,5 @@
 OpenSearchODBC = Installed
 
 [OpenSearchODBC]
-Driver = <project-root>/lib64/libodfesqlodbc.dylib
-Setup  = <project-root>/lib64/libodfesqlodbc.dylib
+Driver = <project-root>/lib64/libsqlodbc.dylib
+Setup  = <project-root>/lib64/libsqlodbc.dylib
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
@@ -28,13 +28,13 @@ project(itodbc_catalog)
 set(SOURCE_FILES test_odbc_catalog.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  )
 
 # Generate executable
 add_executable(itodbc_catalog ${SOURCE_FILES})
 
 # Library dependencies
 target_code_coverage(itodbc_catalog PUBLIC AUTO ALL)
-target_link_libraries(itodbc_catalog odfesqlodbc itodbc_helper ut_helper gtest_main)
+target_link_libraries(itodbc_catalog sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_catalog PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
@@ -102,7 +102,7 @@ const std::vector< short > flights_sql_data_type = {
     SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_TYPE_TIMESTAMP, SQL_WVARCHAR,
     SQL_WVARCHAR, SQL_BIT,      SQL_REAL,     SQL_WVARCHAR,       SQL_WVARCHAR,
     SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR,       SQL_WVARCHAR};
-const std::string flights_catalog_odfe = "odfe-cluster";
+const std::string flights_catalog_opensearch = "opensearch-cluster";
 const std::string flights_catalog_elas = "opensearch";
 const std::string flights_table_name = "opensearch_dashboards_sample_data_flights";
 const std::string flights_decimal_digits = "10";
@@ -451,9 +451,9 @@ TEST_SQL_KEYS(ForeignKeys_NULL, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
 
 // Catalog specified
 TEST_SQL_KEYS(PrimaryKeys_Catalog, SQLPrimaryKeys, NULL, SQL_NTS,
-              (SQLTCHAR*)L"odfe-cluster", SQL_NTS, NULL, SQL_NTS)
+              (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, NULL, SQL_NTS)
 TEST_SQL_KEYS(ForeignKeys_Catalog, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"odfe-cluster", SQL_NTS,
+              NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster", SQL_NTS,
               NULL, SQL_NTS)
 
 // Table specified
@@ -465,10 +465,10 @@ TEST_SQL_KEYS(ForeignKeys_Table, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
 
 // Catalog and table specified
 TEST_SQL_KEYS(PrimaryKeys_CatalogTable, SQLPrimaryKeys, NULL, SQL_NTS,
-              (SQLTCHAR*)L"odfe-cluster", SQL_NTS,
+              (SQLTCHAR*)L"opensearch-cluster", SQL_NTS,
               (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
 TEST_SQL_KEYS(ForeignKeys_CatalogTable, SQLForeignKeys, NULL, SQL_NTS, NULL,
-              SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"odfe-cluster",
+              SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster",
               SQL_NTS, (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
 
 // GetTypeInfo expected output struct

diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
@@ -28,14 +28,14 @@ project(itodbc_connection)
 set(SOURCE_FILES test_odbc_connection.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  )
 
 # Generate executable
 add_executable(itodbc_connection ${SOURCE_FILES})
 
 # Library dependencies
 target_code_coverage(itodbc_connection PUBLIC AUTO ALL)
-target_link_libraries(itodbc_connection odfesqlodbc itodbc_helper ut_helper gtest_main)
+target_link_libraries(itodbc_connection sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_connection PUBLIC _UNICODE UNICODE)
 
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg
@@ -4,8 +4,8 @@ Windows Registry Editor Version 5.00
 "OpenSearchODBC"="Installed"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
-"Driver"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
-"Setup"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
+"Driver"="<project-root>\\bin64\\Release\\sqlodbc.dll"
+"Setup"="<project-root>\\bin64\\Release\\sqlodbc.dll"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
 "test_dsn"="OpenSearchODBC"

diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini
@@ -2,8 +2,8 @@
 OpenSearchODBC = Installed
 
 [OpenSearchODBC]
-Driver = <project-root>/lib64/libodfesqlodbc.dylib
-Setup  = <project-root>/lib64/libodfesqlodbc.dylib
+Driver = <project-root>/lib64/libsqlodbc.dylib
+Setup  = <project-root>/lib64/libsqlodbc.dylib
 
 [OpenSearch Unicode]
 logOutput = C:\
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
@@ -28,13 +28,13 @@ project(itodbc_descriptors)
 set(SOURCE_FILES test_odbc_descriptors.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  )
 
 # Generate executable
 add_executable(itodbc_descriptors ${SOURCE_FILES})
 
 # Library dependencies
 target_code_coverage(itodbc_descriptors PUBLIC AUTO ALL)
-target_link_libraries(itodbc_descriptors odfesqlodbc itodbc_helper ut_helper gtest_main)
+target_link_libraries(itodbc_descriptors sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_descriptors PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
@@ -28,12 +28,12 @@ project(itodbc_execution)
 set(SOURCE_FILES test_odbc_execution.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  )
 
 # Generate executable
 add_executable(itodbc_execution ${SOURCE_FILES})
 
 # Library dependencies
-target_link_libraries(itodbc_execution odfesqlodbc itodbc_helper ut_helper gtest_main)
+target_link_libraries(itodbc_execution sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_execution PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
@@ -29,13 +29,13 @@ set(SOURCE_FILES it_odbc_helper.cpp)
 set(HEADER_FILES it_odbc_helper.h)	
 include_directories(	
                         ${UT_HELPER}
-                        ${ODFEODBC_SRC}
+                        ${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  
                     )
 
 # Generate dll (SHARED)
 add_library(itodbc_helper SHARED ${SOURCE_FILES} ${HEADER_FILES})
 
 # Library dependencies
-target_link_libraries(itodbc_helper odfesqlodbc ut_helper gtest_main)
+target_link_libraries(itodbc_helper sqlodbc ut_helper gtest_main)
 target_compile_definitions(itodbc_helper PUBLIC _UNICODE UNICODE)	
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
@@ -28,13 +28,13 @@ project(itodbc_info)
 set(SOURCE_FILES test_odbc_info.cpp)
 include_directories(	${UT_HELPER}
 						${IT_HELPER}
-						${ODFEODBC_SRC}
+						${OPENSEARCHODBC_SRC}
 						${VLD_SRC}  )
 
 # Generate executable
 add_executable(itodbc_info ${SOURCE_FILES})
 
 # Library dependencies
 target_code_coverage(itodbc_info PUBLIC AUTO ALL)
-target_link_libraries(itodbc_info odfesqlodbc itodbc_helper ut_helper gtest_main)
+target_link_libraries(itodbc_info sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_info PUBLIC _UNICODE UNICODE)