diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index efa33d7d..8d9119ee 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -131,11 +131,11 @@ void AssetsLoader::processPreloadList(AssetType tag, dynamic::List* list) {
     }
     for (uint i = 0; i < list->size(); i++) {
         auto value = list->get(i);
-        switch (static_cast<dynamic::valtype>(value.index())) {
-            case dynamic::valtype::string:
+        switch (static_cast<dynamic::Type>(value.index())) {
+            case dynamic::Type::string:
                 processPreload(tag, std::get<std::string>(value), nullptr);
                 break;
-            case dynamic::valtype::map: {
+            case dynamic::Type::map: {
                 auto map = std::get<dynamic::Map_sptr>(value);
                 auto name = map->get<std::string>("name");
                 processPreload(tag, name, map.get());
diff --git a/src/coders/binary_json.cpp b/src/coders/binary_json.cpp
index e1cc95bd..8c3236e8 100644
--- a/src/coders/binary_json.cpp
+++ b/src/coders/binary_json.cpp
@@ -10,22 +10,22 @@ using namespace json;
 using namespace dynamic;
 
 static void to_binary(ByteBuilder& builder, const Value& value) {
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::none:
+    switch (static_cast<Type>(value.index())) {
+        case Type::none:
             throw std::runtime_error("none value is not implemented");
-        case valtype::map: {
+        case Type::map: {
             auto bytes = to_binary(std::get<Map_sptr>(value).get());
             builder.put(bytes.data(), bytes.size());
             break;
         }
-        case valtype::list:
+        case Type::list:
             builder.put(BJSON_TYPE_LIST);
             for (auto& element : std::get<List_sptr>(value)->values) {
                 to_binary(builder, element);
             }
             builder.put(BJSON_END);
             break;
-        case valtype::integer: {
+        case Type::integer: {
             auto val = std::get<integer_t>(value);
             if (val >= 0 && val <= 255) {
                 builder.put(BJSON_TYPE_BYTE);
@@ -42,14 +42,14 @@ static void to_binary(ByteBuilder& builder, const Value& value) {
             }
             break;
         }
-        case valtype::number:
+        case Type::number:
             builder.put(BJSON_TYPE_NUMBER);
             builder.putFloat64(std::get<number_t>(value));
             break;
-        case valtype::boolean:
+        case Type::boolean:
             builder.put(BJSON_TYPE_FALSE + std::get<bool>(value));
             break;
-        case valtype::string:
+        case Type::string:
             builder.put(BJSON_TYPE_STRING);
             builder.put(std::get<std::string>(value));
             break;
diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp
index ec2b2942..3649480b 100644
--- a/src/data/dynamic.cpp
+++ b/src/data/dynamic.cpp
@@ -4,11 +4,11 @@ using namespace dynamic;
 
 std::string List::str(size_t index) const {
     const auto& value = values[index];
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::string: return std::get<std::string>(value);
-        case valtype::boolean: return std::get<bool>(value) ? "true" : "false";
-        case valtype::number: return std::to_string(std::get<double>(value));
-        case valtype::integer: return std::to_string(std::get<int64_t>(value));
+    switch (static_cast<Type>(value.index())) {
+        case Type::string: return std::get<std::string>(value);
+        case Type::boolean: return std::get<bool>(value) ? "true" : "false";
+        case Type::number: return std::to_string(std::get<double>(value));
+        case Type::integer: return std::to_string(std::get<int64_t>(value));
         default:
             throw std::runtime_error("type error");
     }
@@ -16,11 +16,11 @@ std::string List::str(size_t index) const {
 
 number_t List::num(size_t index) const {
     const auto& value = values[index];
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::number: return std::get<number_t>(value);
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::string: return std::stoll(std::get<std::string>(value));
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::number: return std::get<number_t>(value);
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::string: return std::stoll(std::get<std::string>(value));
+        case Type::boolean: return std::get<bool>(value);
         default:
             throw std::runtime_error("type error");
     }
@@ -28,11 +28,11 @@ number_t List::num(size_t index) const {
 
 integer_t List::integer(size_t index) const {
     const auto& value = values[index];
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::number: return std::get<number_t>(value);
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::string: return std::stoll(std::get<std::string>(value));
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::number: return std::get<number_t>(value);
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::string: return std::stoll(std::get<std::string>(value));
+        case Type::boolean: return std::get<bool>(value);
         default:
             throw std::runtime_error("type error");
     }
@@ -56,9 +56,9 @@ List* List::list(size_t index) const {
 
 bool List::flag(size_t index) const {
     const auto& value = values[index];
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::boolean: return std::get<bool>(value);
         default:
             throw std::runtime_error("type error");
     }
@@ -101,11 +101,11 @@ std::string Map::get(const std::string& key, const std::string def) const {
     if (found == values.end())
         return def;
     auto& value = found->second;
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::string: return std::get<std::string>(value);
-        case valtype::boolean: return std::get<bool>(value) ? "true" : "false";
-        case valtype::number: return std::to_string(std::get<number_t>(value));
-        case valtype::integer: return std::to_string(std::get<integer_t>(value));
+    switch (static_cast<Type>(value.index())) {
+        case Type::string: return std::get<std::string>(value);
+        case Type::boolean: return std::get<bool>(value) ? "true" : "false";
+        case Type::number: return std::to_string(std::get<number_t>(value));
+        case Type::integer: return std::to_string(std::get<integer_t>(value));
         default: throw std::runtime_error("type error");
     }
 }
@@ -115,11 +115,11 @@ number_t Map::get(const std::string& key, double def) const {
     if (found == values.end())
         return def;
     auto& value = found->second;
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::number: return std::get<number_t>(value);
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::string: return std::stoull(std::get<std::string>(value));
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::number: return std::get<number_t>(value);
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::string: return std::stoull(std::get<std::string>(value));
+        case Type::boolean: return std::get<bool>(value);
         default: throw std::runtime_error("type error");
     }
 }
@@ -129,11 +129,11 @@ integer_t Map::get(const std::string& key, integer_t def) const {
     if (found == values.end())
         return def;
     auto& value = found->second;
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::number: return std::get<number_t>(value);
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::string: return std::stoull(std::get<std::string>(value));
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::number: return std::get<number_t>(value);
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::string: return std::stoull(std::get<std::string>(value));
+        case Type::boolean: return std::get<bool>(value);
         default: throw std::runtime_error("type error");
     }
 }
@@ -143,9 +143,9 @@ bool Map::get(const std::string& key, bool def) const {
     if (found == values.end())
         return def;
     auto& value = found->second;
-    switch (static_cast<valtype>(value.index())) {
-        case valtype::integer: return std::get<integer_t>(value);
-        case valtype::boolean: return std::get<bool>(value);
+    switch (static_cast<Type>(value.index())) {
+        case Type::integer: return std::get<integer_t>(value);
+        case Type::boolean: return std::get<bool>(value);
         default: throw std::runtime_error("type error");
     }
 }
diff --git a/src/data/dynamic.hpp b/src/data/dynamic.hpp
index 0e81dd4b..190fc25a 100644
--- a/src/data/dynamic.hpp
+++ b/src/data/dynamic.hpp
@@ -14,7 +14,7 @@ namespace dynamic {
     class Map;
     class List;
 
-    enum class valtype {
+    enum class Type {
         none=0, map, list, string, number, boolean, integer
     };