Stage 1 of rename

TODO: re-enable glave build, advance API for glave

v2: get rid of outdated code in tri introduced by rebase
    rename wsi_null.c (olv)
diff --git a/icd/README.md b/icd/README.md
index 2c0b009..bec64cd 100644
--- a/icd/README.md
+++ b/icd/README.md
@@ -3,12 +3,12 @@
 - [Implementation for Intel GPUs](intel)
 - [Null driver](nulldrv)
 - [*Sample Driver Tests*](../tests)
-    - Now includes Golden images to verify xgl_render_tests rendering.
+    - Now includes Golden images to verify vk_render_tests rendering.
 
-common/ provides helper and utility functions, as well as all XGL entry points
-except xglInitAndEnumerateGpus.  Hardware drivers are required to provide that
-function, and to embed a "XGL_LAYER_DISPATCH_TABLE *" as the first member of
-XGL_PHYSICAL_GPU and all XGL_BASE_OBJECT.
+common/ provides helper and utility functions, as well as all VK entry points
+except vkInitAndEnumerateGpus.  Hardware drivers are required to provide that
+function, and to embed a "VK_LAYER_DISPATCH_TABLE *" as the first member of
+VK_PHYSICAL_GPU and all VK_BASE_OBJECT.
 
 Thread safety
 
@@ -20,7 +20,7 @@
  They require that there is no other thread calling the ICD when these
  functions are called
 
-  - xglInitAndEnumerateGpus
-  - xglDbgRegisterMsgCallback
-  - xglDbgUnregisterMsgCallback
-  - xglDbgSetGlobalOption
+  - vkInitAndEnumerateGpus
+  - vkDbgRegisterMsgCallback
+  - vkDbgUnregisterMsgCallback
+  - vkDbgSetGlobalOption