diff --git a/samples/00_enumopencl/main.cpp b/samples/00_enumopencl/main.cpp
index a848823..40e4a18 100644
--- a/samples/00_enumopencl/main.cpp
+++ b/samples/00_enumopencl/main.cpp
@@ -90,9 +90,9 @@ static cl_int PrintPlatformInfoSummary(
         CL_PLATFORM_VERSION,
         platformVersion );
 
-    printf("\tName:           %s\n", platformName );
-    printf("\tVendor:         %s\n", platformVendor );
-    printf("\tDriver Version: %s\n", platformVersion );
+    printf("\tName:             %s\n", platformName );
+    printf("\tVendor:           %s\n", platformVendor );
+    printf("\tPlatform Version: %s\n", platformVersion );
 
     delete [] platformName;
     delete [] platformVendor;
diff --git a/samples/00_enumopenclpp/main.cpp b/samples/00_enumopenclpp/main.cpp
index 914178c..f165afb 100644
--- a/samples/00_enumopenclpp/main.cpp
+++ b/samples/00_enumopenclpp/main.cpp
@@ -13,9 +13,9 @@
 static cl_int PrintPlatformInfoSummary(
     cl::Platform platform )
 {
-    printf("\tName:           %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
-    printf("\tVendor:         %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
-    printf("\tDriver Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
+    printf("\tName:             %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
+    printf("\tVendor:           %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
+    printf("\tPlatform Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
 
     return CL_SUCCESS;
 }
diff --git a/samples/00_enumqueuefamilies/main.cpp b/samples/00_enumqueuefamilies/main.cpp
index 794971c..7e6f15a 100644
--- a/samples/00_enumqueuefamilies/main.cpp
+++ b/samples/00_enumqueuefamilies/main.cpp
@@ -66,9 +66,9 @@ static void PrintQueueCapabilities(
 static void PrintPlatformInfoSummary(
     cl::Platform platform )
 {
-    printf("\tName:           %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
-    printf("\tVendor:         %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
-    printf("\tDriver Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
+    printf("\tName:             %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
+    printf("\tVendor:           %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
+    printf("\tPlatform Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
 }
 
 static void PrintDeviceInfoSummary(
diff --git a/samples/00_extendeddevicequeries/main.cpp b/samples/00_extendeddevicequeries/main.cpp
index cb91653..a727133 100644
--- a/samples/00_extendeddevicequeries/main.cpp
+++ b/samples/00_extendeddevicequeries/main.cpp
@@ -38,9 +38,9 @@ static void PrintDeviceFeatureCapabilities(
 static void PrintPlatformInfoSummary(
     cl::Platform platform )
 {
-    printf("\tName:           %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
-    printf("\tVendor:         %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
-    printf("\tDriver Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
+    printf("\tName:             %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
+    printf("\tVendor:           %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
+    printf("\tPlatform Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
 }
 
 static void PrintDeviceInfoSummary(
diff --git a/samples/00_newqueries/main.cpp b/samples/00_newqueries/main.cpp
index 9935d9d..a69594c 100644
--- a/samples/00_newqueries/main.cpp
+++ b/samples/00_newqueries/main.cpp
@@ -93,9 +93,9 @@ static void PrintPlatformInfoSummary(
         CL_PLATFORM_VERSION,
         platformVersion );
 
-    printf("\tName:           %s\n", platformName );
-    printf("\tVendor:         %s\n", platformVendor );
-    printf("\tDriver Version: %s\n", platformVersion );
+    printf("\tName:             %s\n", platformName );
+    printf("\tVendor:           %s\n", platformVendor );
+    printf("\tPlatform Version: %s\n", platformVersion );
 
     // Use the query for the platform numeric version as a test for
     // OpenCL 3.0 support.  If this query fails then this probably
diff --git a/samples/00_newqueriespp/main.cpp b/samples/00_newqueriespp/main.cpp
index 35b984a..b01d612 100644
--- a/samples/00_newqueriespp/main.cpp
+++ b/samples/00_newqueriespp/main.cpp
@@ -15,9 +15,9 @@
 static void PrintPlatformInfoSummary(
     cl::Platform platform )
 {
-    printf("\tName:           %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
-    printf("\tVendor:         %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
-    printf("\tDriver Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
+    printf("\tName:             %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
+    printf("\tVendor:           %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
+    printf("\tPlatform Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
 
     // Use the query for the platform numeric version as a test for
     // OpenCL 3.0 support.  If this query fails then this probably
diff --git a/samples/00_spirvqueries/main.cpp b/samples/00_spirvqueries/main.cpp
index 28b1226..28e936f 100644
--- a/samples/00_spirvqueries/main.cpp
+++ b/samples/00_spirvqueries/main.cpp
@@ -56,9 +56,9 @@ int main(
         const cl::Platform& platform = platforms[p];
 
         printf("Platform[%zu]:\n", p);
-        printf("\tName:           %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
-        printf("\tVendor:         %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
-        printf("\tDriver Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
+        printf("\tName:             %s\n", platform.getInfo<CL_PLATFORM_NAME>().c_str() );
+        printf("\tVendor:           %s\n", platform.getInfo<CL_PLATFORM_VENDOR>().c_str() );
+        printf("\tPlatform Version: %s\n", platform.getInfo<CL_PLATFORM_VERSION>().c_str() );
 
         std::vector<cl::Device> devices;
         platform.getDevices(CL_DEVICE_TYPE_ALL, &devices);
diff --git a/samples/python/00_enumopencl/enumopencl.ipynb b/samples/python/00_enumopencl/enumopencl.ipynb
index 34ddb7a..798ab32 100644
--- a/samples/python/00_enumopencl/enumopencl.ipynb
+++ b/samples/python/00_enumopencl/enumopencl.ipynb
@@ -69,9 +69,9 @@
    "source": [
     "for p, platform in enumerate(cl.get_platforms()):\n",
     "    print(\"Platform[{}]:\".format(p))\n",
-    "    print(\"        Name:           \" + platform.get_info(cl.platform_info.NAME))\n",
-    "    print(\"        Vendor:         \" + platform.get_info(cl.platform_info.VENDOR))\n",
-    "    print(\"        Driver Version: \" + platform.get_info(cl.platform_info.VERSION))\n",
+    "    print(\"        Name:             \" + platform.get_info(cl.platform_info.NAME))\n",
+    "    print(\"        Vendor:           \" + platform.get_info(cl.platform_info.VENDOR))\n",
+    "    print(\"        Platform Version: \" + platform.get_info(cl.platform_info.VERSION))\n",
     "    for d, device in enumerate(platform.get_devices()):\n",
     "        print(\"Device[{}]:\".format(d))\n",
     "        print(\"        Type:           \" + cl.device_type.to_string(device.get_info(cl.device_info.TYPE)))\n",
diff --git a/samples/python/00_enumopencl/enumopencl.py b/samples/python/00_enumopencl/enumopencl.py
index 96b7d9f..de69e0c 100644
--- a/samples/python/00_enumopencl/enumopencl.py
+++ b/samples/python/00_enumopencl/enumopencl.py
@@ -8,9 +8,9 @@
 
 for p, platform in enumerate(cl.get_platforms()):
     print("Platform[{}]:".format(p))
-    print("        Name:           " + platform.get_info(cl.platform_info.NAME))
-    print("        Vendor:         " + platform.get_info(cl.platform_info.VENDOR))
-    print("        Driver Version: " + platform.get_info(cl.platform_info.VERSION))
+    print("        Name:             " + platform.get_info(cl.platform_info.NAME))
+    print("        Vendor:           " + platform.get_info(cl.platform_info.VENDOR))
+    print("        Platform Version: " + platform.get_info(cl.platform_info.VERSION))
     for d, device in enumerate(platform.get_devices()):
         print("Device[{}]:".format(d))
         print("        Type:           " + cl.device_type.to_string(device.get_info(cl.device_info.TYPE)))