diff --git a/container/service.proto b/container/service.proto
index 757de29..5d689e5 100644
--- a/container/service.proto
+++ b/container/service.proto
@@ -45,7 +45,7 @@ message PutRequest {
 
 message PutResponse {
     // CID (container id) is a SHA256 hash of the container structure
-    bytes CID = 1 [(gogoproto.customtype) = "CID", (gogoproto.nullable) = false];
+    bytes ContainerID = 1;
 }
 
 message DeleteRequest {
@@ -62,7 +62,7 @@ message DeleteResponse { }
 
 message GetRequest {
     // CID (container id) is a SHA256 hash of the container structure
-    bytes CID                                = 1 [(gogoproto.customtype) = "CID", (gogoproto.nullable) = false];
+    bytes ContainerID = 1;
 }
 
 message GetResponse {
@@ -72,12 +72,12 @@ message GetResponse {
 
 message ListRequest {
     // OwnerID is a wallet address
-    bytes OwnerID                            = 1 [(gogoproto.customtype) = "OwnerID", (gogoproto.nullable) = false];
+    bytes OwnerID = 1;
 }
 
 message ListResponse {
     // CID (container id) is list of SHA256 hashes of the container structures
-    repeated bytes CID = 1 [(gogoproto.customtype) = "CID", (gogoproto.nullable) = false];
+    repeated bytes ContainerIDs = 1;
 }
 
 message SetExtendedACLRequest {