diff --git a/composable_kernel/include/utility/common_header.hpp b/composable_kernel/include/utility/common_header.hpp
index c4346e45d0..45d22cd618 100644
--- a/composable_kernel/include/utility/common_header.hpp
+++ b/composable_kernel/include/utility/common_header.hpp
@@ -7,9 +7,9 @@
 #include "statically_indexed_array.hpp"
 #include "container_element_picker.hpp"
 #include "multi_index.hpp"
-#include "data_type_enum.hpp"
 #include "data_type.hpp"
-#include "data_type_helper.hpp"
+#include "data_type_enum.hpp"
+#include "data_type_enum_helper.hpp"
 #include "functional.hpp"
 #include "functional2.hpp"
 #include "functional3.hpp"
diff --git a/composable_kernel/include/utility/data_type_enum.hpp b/composable_kernel/include/utility/data_type_enum.hpp
index 10a8771052..35df0067a9 100644
--- a/composable_kernel/include/utility/data_type_enum.hpp
+++ b/composable_kernel/include/utility/data_type_enum.hpp
@@ -3,8 +3,8 @@
 
 namespace ck {
 
-// this enumerate should be synchronized with include/miopen.h
-using DataTypeEnum_t = enum {
+enum DataTypeEnum_t
+{
     Half     = 0,
     Float    = 1,
     Int32    = 2,
diff --git a/composable_kernel/include/utility/data_type_helper.hpp b/composable_kernel/include/utility/data_type_enum_helper.hpp
similarity index 94%
rename from composable_kernel/include/utility/data_type_helper.hpp
rename to composable_kernel/include/utility/data_type_enum_helper.hpp
index 6a234cd10b..451ce992b1 100644
--- a/composable_kernel/include/utility/data_type_helper.hpp
+++ b/composable_kernel/include/utility/data_type_enum_helper.hpp
@@ -1,5 +1,5 @@
-#ifndef CK_DATA_TYPE_HELPER_HPP
-#define CK_DATA_TYPE_HELPER_HPP
+#ifndef CK_DATA_TYPE_ENUM_HELPER_HPP
+#define CK_DATA_TYPE_ENUM_HELPER_HPP
 
 #include "data_type.hpp"
 #include "data_type_enum.hpp"