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/intel/instance.h b/icd/intel/instance.h
index 474e0b5..b61c2ef 100644
--- a/icd/intel/instance.h
+++ b/icd/intel/instance.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2015 LunarG, Inc.
  *
@@ -41,7 +41,7 @@
     bool exts[INTEL_EXT_COUNT];
 };
 
-static inline struct intel_instance *intel_instance(XGL_INSTANCE instance)
+static inline struct intel_instance *intel_instance(VK_INSTANCE instance)
 {
     return (struct intel_instance *) instance;
 }