diff --git a/common/proto3/common/CMakeLists.txt b/common/proto3/common/CMakeLists.txt
index 367c0801c..7c54ebb52 100644
--- a/common/proto3/common/CMakeLists.txt
+++ b/common/proto3/common/CMakeLists.txt
@@ -1,5 +1,14 @@
 cmake_minimum_required(VERSION 3.17.0)
 
+# Collect proto files from the new 1-1-1 structure
+file(GLOB_RECURSE ProtoFiles
+    "${CMAKE_CURRENT_SOURCE_DIR}/enums/*.proto"
+    "${CMAKE_CURRENT_SOURCE_DIR}/messages/*.proto"
+    "${CMAKE_CURRENT_SOURCE_DIR}/anon/*.proto"
+    "${CMAKE_CURRENT_SOURCE_DIR}/auth/*.proto"
+    "${CMAKE_CURRENT_SOURCE_DIR}/envelope.proto"
+)
+
 # Generate C++ from protos
 protobuf_generate(
     LANGUAGE cpp
diff --git a/common/proto3/common/enums/error_code.proto b/common/proto3/common/enums/error_code.proto
index 2d643629f..3abad9577 100644
--- a/common/proto3/common/enums/error_code.proto
+++ b/common/proto3/common/enums/error_code.proto
@@ -5,13 +5,13 @@ package SDMS;
 option cc_enable_arenas = true;
 
 enum ErrorCode {
-    ERROR_CODE_UNSPECIFIED = 0;
-    ERROR_CODE_BAD_REQUEST = 1;
-    ERROR_CODE_INTERNAL_ERROR = 2;
-    ERROR_CODE_CLIENT_ERROR = 3;
-    ERROR_CODE_SERVICE_ERROR = 4;
-    ERROR_CODE_AUTHN_REQUIRED = 5;
-    ERROR_CODE_AUTHN_ERROR = 6;
-    ERROR_CODE_DEST_PATH_ERROR = 7;
-    ERROR_CODE_DEST_FILE_ERROR = 8;
+    UNSPECIFIED = 0;
+    BAD_REQUEST = 1;
+    INTERNAL_ERROR = 2;
+    CLIENT_ERROR = 3;
+    SERVICE_ERROR = 4;
+    AUTHN_REQUIRED = 5;
+    AUTHN_ERROR = 6;
+    DEST_PATH_ERROR = 7;
+    DEST_FILE_ERROR = 8;
 }