From f7388e18e0908d2b675159176f9c9a8a6f52637e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sat, 14 Aug 2021 16:16:37 +0200
Subject: [PATCH] WIP: consolidation

---
 proto/caosdb/entity/v1alpha1/main.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/proto/caosdb/entity/v1alpha1/main.proto b/proto/caosdb/entity/v1alpha1/main.proto
index ca275df..f269f86 100644
--- a/proto/caosdb/entity/v1alpha1/main.proto
+++ b/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;
   }
 }
 
-- 
GitLab