WIP: consolidation

proto/caosdb/entity/v1alpha1/main.proto

@@ -63,11 +63,11 @@ message DataType {
   // Wraps atomic types, LIST and REFERENCE
   oneof data_type {
     // The atomic data types.
-    AtomicDataType atomic_type = 1;
+    AtomicDataType atomic_data_type = 1;
     // A list data type.
-    ListDataType list_type = 2;
+    ListDataType list_data_type = 2;
     // A reference data type.
-    ReferenceDataType reference_type = 3;
+    ReferenceDataType reference_data_type = 3;
   }
 }