diff --git a/data/DataType/byte_d.yaml b/data/DataType/byte.yaml
similarity index 100%
rename from data/DataType/byte_d.yaml
rename to data/DataType/byte.yaml
diff --git a/data/DataType/byte_java.yaml b/data/DataType/byte_java.yaml
deleted file mode 100644
index 726040c..0000000
--- a/data/DataType/byte_java.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: byte
-integer-min: '-128'
-integer-max: '127'
-integer-signed: true
diff --git a/data/DataType/char_d.yaml b/data/DataType/char_d.yaml
deleted file mode 100644
index b83f734..0000000
--- a/data/DataType/char_d.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: char
-integer-min: '0'
-integer-max: '65535'
-integer-signed: false
diff --git a/data/DataType/char_java.yaml b/data/DataType/char_java.yaml
index 80b797f..faeca57 100644
--- a/data/DataType/char_java.yaml
+++ b/data/DataType/char_java.yaml
@@ -3,4 +3,4 @@ integer-min: '0'
 integer-max: '65535'
 integer-signed: false
 delimiters:
-  - java_char
+  - c_char
diff --git a/data/DataType/long_d.yaml b/data/DataType/long_2E3.yaml
similarity index 100%
rename from data/DataType/long_d.yaml
rename to data/DataType/long_2E3.yaml
diff --git a/data/DataType/long_cpp.yaml b/data/DataType/long_cpp.yaml
deleted file mode 100644
index aa82198..0000000
--- a/data/DataType/long_cpp.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: long
-integer-min: '-2,147,483,648'
-integer-max: '2,147,483,647'
-integer-signed: true
diff --git a/data/DataType/long_cs.yaml b/data/DataType/long_cs.yaml
deleted file mode 100644
index 5c49b39..0000000
--- a/data/DataType/long_cs.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: long
-integer-min: '–9223372036854775808'
-integer-max: '9223372036854775807'
-integer-signed: true
diff --git a/data/DataType/long_java.yaml b/data/DataType/long_java.yaml
deleted file mode 100644
index 5bef6fa..0000000
--- a/data/DataType/long_java.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: long
-integer-min: '-9223372036854775808'
-integer-max: '9223372036854775807'
-integer-signed: true
diff --git a/data/DataType/short_c.yaml b/data/DataType/short.yaml
similarity index 100%
rename from data/DataType/short_c.yaml
rename to data/DataType/short.yaml
diff --git a/data/DataType/short_d.yaml b/data/DataType/short_d.yaml
deleted file mode 100644
index 8a2f82a..0000000
--- a/data/DataType/short_d.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: short
-integer-min: '-32768'
-integer-max: '32767'
-integer-signed: true
diff --git a/data/DataType/short_java.yaml b/data/DataType/short_java.yaml
deleted file mode 100644
index 8a2f82a..0000000
--- a/data/DataType/short_java.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-keyword: short
-integer-min: '-32768'
-integer-max: '32767'
-integer-signed: true
diff --git a/data/Delimiter/java_char.yaml b/data/Delimiter/java_char.yaml
deleted file mode 100644
index d0dc67a..0000000
--- a/data/Delimiter/java_char.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: string
-start: "'"
-end: "'"
-escape: \
-length: 1
diff --git a/data/Language/C.yaml b/data/Language/C.yaml
index 250db11..6a15c5c 100644
--- a/data/Language/C.yaml
+++ b/data/Language/C.yaml
@@ -66,7 +66,7 @@ keywords:
   - '#line'
   - '#pragma'
 datatypes:
-  - short_c
+  - short
   - ushort_c
   - uint_c
   - int
diff --git a/data/Language/CPlusPlus.yaml b/data/Language/CPlusPlus.yaml
index 636caaf..1699bd9 100644
--- a/data/Language/CPlusPlus.yaml
+++ b/data/Language/CPlusPlus.yaml
@@ -114,7 +114,7 @@ keywords:
 datatypes:
   - bool_lower_case
   - void_cpp
-  - short_c
+  - short
   - ushort_c
   - uint_c
   - int_c
diff --git a/data/Language/CSharp.yaml b/data/Language/CSharp.yaml
index 760f2ed..5e69924 100644
--- a/data/Language/CSharp.yaml
+++ b/data/Language/CSharp.yaml
@@ -91,9 +91,9 @@ datatypes:
   - double_c
   - float_c
   - int_c
-  - long_cs
+  - long_2E63
   - sbyte_cs
-  - short_c
+  - short
   - uint_cs
   - ulong_cs
   - ushort_cs
diff --git a/data/Language/D.yaml b/data/Language/D.yaml
index 9a33da9..906a5c4 100644
--- a/data/Language/D.yaml
+++ b/data/Language/D.yaml
@@ -14,8 +14,8 @@ delimiters:
   - double_quote_slash_escape
 datatypes:
   - bool_lower_case
-  - byte_d
-  - char_d
+  - byte
+  - char_java
   - const_d
   - cdouble_d
   - cfloat_d
@@ -25,9 +25,9 @@ datatypes:
   - idouble_d
   - ifloat_d
   - int
-  - long_d
+  - long_2E63
   - real_d
-  - short_d
+  - short
   - ubyte_d
   - ucent_d
   - uint_d
diff --git a/data/Language/Java.yaml b/data/Language/Java.yaml
index 6e0cc49..5058b67 100644
--- a/data/Language/Java.yaml
+++ b/data/Language/Java.yaml
@@ -15,11 +15,11 @@ delimiters:
   - double_quote_slash_escape
 datatypes:
   - boolean_java
-  - byte_java
+  - byte
   - char_java
   - int
-  - long_java
-  - short_java
+  - long_2E63
+  - short
   - float_java
   - double_java
 keywords: