diff --git a/libclc/clc/include/clc/address_space/qualifier.h b/libclc/clc/include/clc/address_space/clc_qualifier.h
similarity index 100%
rename from libclc/clc/include/clc/address_space/qualifier.h
rename to libclc/clc/include/clc/address_space/clc_qualifier.h
diff --git a/libclc/clc/lib/amdgpu/CMakeLists.txt b/libclc/clc/lib/amdgpu/CMakeLists.txt
index f593bc6..8fd0d46 100644
--- a/libclc/clc/lib/amdgpu/CMakeLists.txt
+++ b/libclc/clc/lib/amdgpu/CMakeLists.txt
@@ -1,6 +1,6 @@
 libclc_configure_source_list(CLC_AMDGPU_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}
-  address_space/qualifier.cl
+  address_space/clc_qualifier.cl
   math/clc_exp.cl
   math/clc_exp2.cl
   math/clc_exp10.cl
@@ -18,9 +18,9 @@
   math/clc_native_exp2.cl
   math/clc_native_log10.cl
   mem_fence/clc_mem_fence.cl
-  subgroup/subgroup.cl
-  subgroup/sub_group_broadcast.cl
-  subgroup/sub_group_reduce.cl
+  subgroup/clc_subgroup.cl
+  subgroup/clc_sub_group_broadcast.cl
+  subgroup/clc_sub_group_reduce.cl
   synchronization/clc_sub_group_barrier.cl
   synchronization/clc_work_group_barrier.cl
   workitem/clc_get_enqueued_local_size.cl
diff --git a/libclc/clc/lib/amdgpu/address_space/qualifier.cl b/libclc/clc/lib/amdgpu/address_space/clc_qualifier.cl
similarity index 96%
rename from libclc/clc/lib/amdgpu/address_space/qualifier.cl
rename to libclc/clc/lib/amdgpu/address_space/clc_qualifier.cl
index 82d9f53..fb6de7b 100644
--- a/libclc/clc/lib/amdgpu/address_space/qualifier.cl
+++ b/libclc/clc/lib/amdgpu/address_space/clc_qualifier.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/address_space/qualifier.h>
+#include "clc/address_space/clc_qualifier.h"
 
 #if _CLC_GENERIC_AS_SUPPORTED
 
diff --git a/libclc/clc/lib/amdgpu/subgroup/sub_group_broadcast.cl b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
similarity index 100%
rename from libclc/clc/lib/amdgpu/subgroup/sub_group_broadcast.cl
rename to libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
diff --git a/libclc/clc/lib/amdgpu/subgroup/sub_group_reduce.cl b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_reduce.cl
similarity index 100%
rename from libclc/clc/lib/amdgpu/subgroup/sub_group_reduce.cl
rename to libclc/clc/lib/amdgpu/subgroup/clc_sub_group_reduce.cl
diff --git a/libclc/clc/lib/amdgpu/subgroup/subgroup.cl b/libclc/clc/lib/amdgpu/subgroup/clc_subgroup.cl
similarity index 100%
rename from libclc/clc/lib/amdgpu/subgroup/subgroup.cl
rename to libclc/clc/lib/amdgpu/subgroup/clc_subgroup.cl
diff --git a/libclc/clc/lib/generic/shared/clc_qualifier.cl b/libclc/clc/lib/generic/shared/clc_qualifier.cl
index 978f667..63f168f 100644
--- a/libclc/clc/lib/generic/shared/clc_qualifier.cl
+++ b/libclc/clc/lib/generic/shared/clc_qualifier.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/address_space/qualifier.h>
+#include "clc/address_space/clc_qualifier.h"
 
 #if _CLC_GENERIC_AS_SUPPORTED
 
diff --git a/libclc/opencl/lib/generic/address_space/qualifier.cl b/libclc/opencl/lib/generic/address_space/qualifier.cl
index 8ad4a37..879941b 100644
--- a/libclc/opencl/lib/generic/address_space/qualifier.cl
+++ b/libclc/opencl/lib/generic/address_space/qualifier.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/address_space/qualifier.h"
+#include "clc/address_space/clc_qualifier.h"
 
 #if _CLC_GENERIC_AS_SUPPORTED