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/event.h b/icd/intel/event.h
index f1b21ec..8b891cf 100644
--- a/icd/intel/event.h
+++ b/icd/intel/event.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -37,7 +37,7 @@
     struct intel_obj obj;
 };
 
-static inline struct intel_event *intel_event(XGL_EVENT event)
+static inline struct intel_event *intel_event(VK_EVENT event)
 {
     return (struct intel_event *) event;
 }
@@ -47,13 +47,13 @@
     return (struct intel_event *) obj;
 }
 
-XGL_RESULT intel_event_create(struct intel_dev *dev,
-                              const XGL_EVENT_CREATE_INFO *info,
+VK_RESULT intel_event_create(struct intel_dev *dev,
+                              const VK_EVENT_CREATE_INFO *info,
                               struct intel_event **event_ret);
 void intel_event_destroy(struct intel_event *event);
 
-XGL_RESULT intel_event_set(struct intel_event *event);
-XGL_RESULT intel_event_reset(struct intel_event *event);
-XGL_RESULT intel_event_get_status(struct intel_event *event);
+VK_RESULT intel_event_set(struct intel_event *event);
+VK_RESULT intel_event_reset(struct intel_event *event);
+VK_RESULT intel_event_get_status(struct intel_event *event);
 
 #endif /* EVENT_H */