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/fence.h b/icd/intel/fence.h
index 0ebc45e..947a227 100644
--- a/icd/intel/fence.h
+++ b/icd/intel/fence.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -43,7 +43,7 @@
     void *wsi_data;
 };
 
-static inline struct intel_fence *intel_fence(XGL_FENCE fence)
+static inline struct intel_fence *intel_fence(VK_FENCE fence)
 {
     return (struct intel_fence *) fence;
 }
@@ -53,12 +53,12 @@
     return (struct intel_fence *) obj;
 }
 
-XGL_RESULT intel_fence_create(struct intel_dev *dev,
-                              const XGL_FENCE_CREATE_INFO *info,
+VK_RESULT intel_fence_create(struct intel_dev *dev,
+                              const VK_FENCE_CREATE_INFO *info,
                               struct intel_fence **fence_ret);
 void intel_fence_destroy(struct intel_fence *fence);
 
-XGL_RESULT intel_fence_wait(struct intel_fence *fence, int64_t timeout_ns);
+VK_RESULT intel_fence_wait(struct intel_fence *fence, int64_t timeout_ns);
 
 void intel_fence_copy(struct intel_fence *fence,
                       const struct intel_fence *src);