diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
index 26b70b32bf70b83d54ec0f357831ec4dab10a694..7dd3a7cecc8cbb119575c78b324d6fc87b1a575a 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
@@ -59,13 +59,11 @@ namespace version_proxy
  * Whenever GDALDataset and GDALDriver have to be used to open a
  * vector dataset (or OGRDataSource an OGRSFDriver for gdal 1.x), one
  * should use ogr::version_proxy types GDALDataset and
- * GDALDriverType.
+ * GDALDriver.
  * 
  * See function documentation for details.
  */
 
-  typedef GDALDriver GDALDriverType;
-
   /** 
    * This function opens a file, possibly in read-only mode, and returns
    * a dataset.
@@ -107,7 +105,7 @@ namespace version_proxy
    * \return NULL if dataset could not be created.
    */
   OTBGdalAdapters_EXPORT
-  GDALDataset * Create(GDALDriverType * driver, const char * name , std::vector< std::string > const & options = std::vector< std::string >() );
+  GDALDataset * Create(GDALDriver * driver, const char * name , std::vector< std::string > const & options = std::vector< std::string >() );
 
 
   /**
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
index 841fc59e35c78453f202123bed9901f78f445738..35ae91a72ceefdddc8933420c5d2dd7d23b74352 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
@@ -126,7 +126,7 @@ otb::ogr::DataSource::DataSource()
 {
   Drivers::Init();
 
-  ogr::version_proxy::GDALDriverType * d = 
+  GDALDriver * d = 
     GetGDALDriverManager()->GetDriverByName("Memory");
   assert(d && "OGR Memory driver not found");
   m_DataSource = ogr::version_proxy::Create(d,"in-memory");
@@ -178,7 +178,7 @@ otb::ogr::DataSource::Pointer otb::ogr::DataSource::OpenDataSource(std::string c
         <<simpleFileName<<">.");
       }
 
-    ogr::version_proxy::GDALDriverType * d = 
+    GDALDriver * d = 
       GetGDALDriverManager()->GetDriverByName(  driverName  );
 
     if(!d)
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
index 4b3b17d9ed6e3c225605cd8892ee0d788dc0f502..d1db054b83a686ff53b749abc17133a2437b2eb3 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
@@ -73,7 +73,7 @@ void Close(GDALDataset * dataset)
 #endif
 }
 
-GDALDataset * Create(GDALDriverType * driver, const char * name ,  std::vector< std::string > const & options )
+GDALDataset * Create(GDALDriver * driver, const char * name ,  std::vector< std::string > const & options )
 {
 #if GDAL_VERSION_NUM<2000000
   (void)options;
@@ -97,7 +97,7 @@ bool Delete(const char * name)
 {
   // Open dataset
   GDALDataset * poDS = otb::ogr::version_proxy::Open(name,false);
-  GDALDriverType * poDriver = NULL;
+  GDALDriver * poDriver = NULL;
   if(poDS)
     {
     poDriver = poDS->GetDriver();
diff --git a/Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx b/Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx
index 6cb7c07de7575182a42c311a7ab07d78d764c261..724b505c8656876a70e012ef5653a8794bc61045 100644
--- a/Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx
+++ b/Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx
@@ -1036,7 +1036,7 @@ std::vector<OGRLayer*> OGRIOHelper
   if (inMemoryDataSource == nullptr)
     {
     const char * driverName = "Memory";
-    ogr::version_proxy::GDALDriverType * ogrDriver = GetGDALDriverManager()->GetDriverByName(driverName);
+    GDALDriver * ogrDriver = GetGDALDriverManager()->GetDriverByName(driverName);
     inMemoryDataSource = ogr::version_proxy::Create(ogrDriver,"tempDataSource");
     }
 
diff --git a/Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx b/Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
index 3b5bdbc4e93bc80f719ec6640486012ab20822e7..845920d47168295a5ee4eba089cb89e3c8933ee4 100644
--- a/Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
+++ b/Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
@@ -215,7 +215,7 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char ** /** unused */)
 
 
   //Find first the OGR driver
-  ogr::version_proxy::GDALDriverType * ogrDriver =
+  GDALDriver * ogrDriver =
     GetGDALDriverManager()->GetDriverByName(this->GetOGRDriverName(this->m_FileName).data());
 
   if (ogrDriver == nullptr)
diff --git a/Modules/IO/TestKernel/src/otbTestHelper.cxx b/Modules/IO/TestKernel/src/otbTestHelper.cxx
index 0ce02a82d9cb37eef692fe7624df564579a9285f..1dd364ac85c55dabf8b68f4bf221e0420d917a63 100644
--- a/Modules/IO/TestKernel/src/otbTestHelper.cxx
+++ b/Modules/IO/TestKernel/src/otbTestHelper.cxx
@@ -1728,10 +1728,10 @@ int TestHelper::RegressionTestOgrFile(const char *testOgrFilename, const char *b
   /*      Open data source.                                               */
   /* -------------------------------------------------------------------- */
   GDALDataset *ref_poDS = nullptr;
-  otb::ogr::version_proxy::GDALDriverType *  ref_poDriver = nullptr;
+  GDALDriver *  ref_poDriver = nullptr;
   //OGRGeometry *  ref_poSpatialFilter = NULL;
   GDALDataset *test_poDS = nullptr;
-  otb::ogr::version_proxy::GDALDriverType *  test_poDriver = nullptr;
+  GDALDriver *  test_poDriver = nullptr;
   //OGRGeometry *  test_poSpatialFilter = NULL;
 
   ref_poDS = otb::ogr::version_proxy::Open(ref_pszDataSource, false);