diff --git a/kms/kms.go b/kms/kms.go
index ff45825f1a88015686d384315fbf97391171a676..dcb6c1f12c39ad165914f14ddf7c6b07c686e91e 100644
--- a/kms/kms.go
+++ b/kms/kms.go
@@ -11,6 +11,8 @@ import (
 	"sync"
 	"time"
 
+	pbETSI "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsetsiproto"
+	pbIC "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsintercomproto"
 	"code.fbi.h-da.de/m.stiemerling/proto-kms/quantumlayer"
 	"github.com/google/uuid"
 )
@@ -32,6 +34,8 @@ type eKMS struct {
 	qleMapMutex     sync.Mutex
 	QuantumElements map[qlElementId]*QuantumElement
 	KmsPeers        map[string]*kmsPeer
+	pbETSI.UnimplementedKmsETSIServer
+	pbIC.UnimplementedKmsTalkerServer
 }
 
 // Will keep information about the quantum elements that this eKMS is talking to
diff --git a/kms/kmsetsi.go b/kms/kmsetsi.go
index ce121a29c30c5793afc62fa7fad23050932e12a8..275acb6a4de62de2ee7b44f246ee1cdadaa50ac6 100644
--- a/kms/kmsetsi.go
+++ b/kms/kmsetsi.go
@@ -15,33 +15,38 @@ var (
 	etsiPort = flag.Int("port", 50900, "The server port")
 )
 
-type etsiServer struct {
-	pb.UnimplementedKmsETSIServer
-}
-
-func (s *etsiServer) Capabilities(ctx context.Context, in *pb.CapabilitiesRequest) (capReply *pb.CapabilitiesReply, err error) {
+func (s *eKMS) ETSICapabilities(ctx context.Context, in *pb.ETSICapabilitiesRequest) (capReply *pb.ETSICapabilitiesReply, err error) {
 	log.Printf("Received: %v", in.GetMyKmsName())
 
-	return &pb.CapabilitiesReply{
+	return &pb.ETSICapabilitiesReply{
 		PeerKmsName: "whatever",
 	}, nil
 }
 
-func (s *etsiServer) AddKMSPeer(ctx context.Context, in *pb.KMSPeerRequest) (*pb.KMSPeerReply, error) {
-	return nil, nil
+func (s *eKMS) ETSIAddKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequest) (*pb.ETSIKMSPeerReply, error) {
+
+	s.AddPeer(in.GetKmsPeerSocket())
+
+	return &pb.ETSIKMSPeerReply{
+		KmsPeerName: s.kmsName,
+	}, nil
 }
 
-func (s *etsiServer) RemoveKMSPeer(ctx context.Context, in *pb.KMSPeerRequest) (*pb.KMSPeerReply, error) {
-	return nil, nil
+func (s *eKMS) ETSIRemoveKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequest) (*pb.ETSIKMSPeerReply, error) {
+	s.RemovePeer(in.GetKmsPeerSocket())
+
+	return &pb.ETSIKMSPeerReply{
+		KmsPeerName: s.kmsName,
+	}, nil
 }
 
-func (s *etsiServer) GetEncryptKeys256Bit(ctx context.Context, in *pb.GetEncryptKeys256BitRequest) (*pb.GetEncryptKeys256BitReply, error) {
+func (s *eKMS) GetEncryptKeys256Bit(ctx context.Context, in *pb.ETSIGetEncryptKeys256BitRequest) (*pb.ETSIGetEncryptKeys256BitReply, error) {
 	log.Printf("Received request for n=%d keys", in.GetAmount())
 
 	testBytes := []byte{120, 120, 120}
 
 	// Construct any response
-	return &pb.GetEncryptKeys256BitReply{
+	return &pb.ETSIGetEncryptKeys256BitReply{
 		KeyID: "2",
 		Key:   testBytes,
 	}, nil
@@ -55,7 +60,7 @@ func StartETSI() {
 		log.Fatalf("failed to listen: %v", err)
 	}
 	s := grpc.NewServer()
-	pb.RegisterKmsETSIServer(s, &etsiServer{})
+	pb.RegisterKmsETSIServer(s, &eKMS{})
 	log.Printf("server listening at %v", lis.Addr())
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)
diff --git a/kms/kmsintercom.go b/kms/kmsintercom.go
index ca2ea00e18b2966fca8dbb8b6c1757060bfa27fd..64ab4709bf7b0e10d465d3eefafd225888d2eb1f 100644
--- a/kms/kmsintercom.go
+++ b/kms/kmsintercom.go
@@ -11,14 +11,10 @@ import (
 	"google.golang.org/grpc"
 )
 
-type intercomServer struct {
-	pb.UnimplementedKmsTalkerServer
-}
-
-func (s *intercomServer) Capabilities(ctx context.Context, in *pb.CapabilitiesRequest) (capReply *pb.CapabilitiesReply, err error) {
+func (s *eKMS) InterComCapabilities(ctx context.Context, in *pb.InterComCapabilitiesRequest) (capReply *pb.InterComCapabilitiesReply, err error) {
 	log.Printf("Received: %v", in.GetMyKmsName())
 
-	return &pb.CapabilitiesReply{
+	return &pb.InterComCapabilitiesReply{
 		PeerKmsName: "whatever",
 	}, nil
 }
@@ -31,7 +27,7 @@ func StartInterComm(interComPort int) {
 		log.Fatalf("failed to listen: %v", err)
 	}
 	s := grpc.NewServer()
-	pb.RegisterKmsTalkerServer(s, &intercomServer{})
+	pb.RegisterKmsTalkerServer(s, &eKMS{})
 	log.Printf("server listening at %v", lis.Addr())
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)
diff --git a/kms/kmspeers.go b/kms/kmspeers.go
index d14f031e733b3e1f46c65f6a4f594feb7bf4d92a..f5145ee636ff4b8c4c0555a49756db73edeb3bc8 100644
--- a/kms/kmspeers.go
+++ b/kms/kmspeers.go
@@ -47,7 +47,7 @@ func (kms *eKMS) AddPeer(kmsPeerSocket string) {
 	// Contact the server and print out its response.
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	r, err := c.Capabilities(ctx, &pb.CapabilitiesRequest{MyKmsName: kms.kmsName})
+	r, err := c.ETSICapabilities(ctx, &pb.ETSICapabilitiesRequest{MyKmsName: kms.kmsName})
 	if err != nil {
 		log.Fatalf("could not greet: %v", err)
 	}
diff --git a/kmsetsiproto/kmsetsiproto.pb.go b/kmsetsiproto/kmsetsiproto.pb.go
index f91f574b1fef951b7675f6014fa1277119158db1..beb011c03f75f680e9484031fb857418a08b2938 100644
--- a/kmsetsiproto/kmsetsiproto.pb.go
+++ b/kmsetsiproto/kmsetsiproto.pb.go
@@ -21,7 +21,7 @@ const (
 )
 
 // The request message containing the user's name.
-type CapabilitiesRequest struct {
+type ETSICapabilitiesRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -29,8 +29,8 @@ type CapabilitiesRequest struct {
 	MyKmsName string `protobuf:"bytes,1,opt,name=myKmsName,proto3" json:"myKmsName,omitempty"`
 }
 
-func (x *CapabilitiesRequest) Reset() {
-	*x = CapabilitiesRequest{}
+func (x *ETSICapabilitiesRequest) Reset() {
+	*x = ETSICapabilitiesRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -38,13 +38,13 @@ func (x *CapabilitiesRequest) Reset() {
 	}
 }
 
-func (x *CapabilitiesRequest) String() string {
+func (x *ETSICapabilitiesRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CapabilitiesRequest) ProtoMessage() {}
+func (*ETSICapabilitiesRequest) ProtoMessage() {}
 
-func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
+func (x *ETSICapabilitiesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -56,12 +56,12 @@ func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CapabilitiesRequest.ProtoReflect.Descriptor instead.
-func (*CapabilitiesRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSICapabilitiesRequest.ProtoReflect.Descriptor instead.
+func (*ETSICapabilitiesRequest) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *CapabilitiesRequest) GetMyKmsName() string {
+func (x *ETSICapabilitiesRequest) GetMyKmsName() string {
 	if x != nil {
 		return x.MyKmsName
 	}
@@ -69,7 +69,7 @@ func (x *CapabilitiesRequest) GetMyKmsName() string {
 }
 
 // The response message containing the greetings
-type CapabilitiesReply struct {
+type ETSICapabilitiesReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -77,8 +77,8 @@ type CapabilitiesReply struct {
 	PeerKmsName string `protobuf:"bytes,1,opt,name=peerKmsName,proto3" json:"peerKmsName,omitempty"`
 }
 
-func (x *CapabilitiesReply) Reset() {
-	*x = CapabilitiesReply{}
+func (x *ETSICapabilitiesReply) Reset() {
+	*x = ETSICapabilitiesReply{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -86,13 +86,13 @@ func (x *CapabilitiesReply) Reset() {
 	}
 }
 
-func (x *CapabilitiesReply) String() string {
+func (x *ETSICapabilitiesReply) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CapabilitiesReply) ProtoMessage() {}
+func (*ETSICapabilitiesReply) ProtoMessage() {}
 
-func (x *CapabilitiesReply) ProtoReflect() protoreflect.Message {
+func (x *ETSICapabilitiesReply) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -104,19 +104,19 @@ func (x *CapabilitiesReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CapabilitiesReply.ProtoReflect.Descriptor instead.
-func (*CapabilitiesReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSICapabilitiesReply.ProtoReflect.Descriptor instead.
+func (*ETSICapabilitiesReply) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *CapabilitiesReply) GetPeerKmsName() string {
+func (x *ETSICapabilitiesReply) GetPeerKmsName() string {
 	if x != nil {
 		return x.PeerKmsName
 	}
 	return ""
 }
 
-type KMSPeerRequest struct {
+type ETSIKMSPeerRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -124,8 +124,8 @@ type KMSPeerRequest struct {
 	KmsPeerSocket string `protobuf:"bytes,1,opt,name=kmsPeerSocket,proto3" json:"kmsPeerSocket,omitempty"`
 }
 
-func (x *KMSPeerRequest) Reset() {
-	*x = KMSPeerRequest{}
+func (x *ETSIKMSPeerRequest) Reset() {
+	*x = ETSIKMSPeerRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -133,13 +133,13 @@ func (x *KMSPeerRequest) Reset() {
 	}
 }
 
-func (x *KMSPeerRequest) String() string {
+func (x *ETSIKMSPeerRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*KMSPeerRequest) ProtoMessage() {}
+func (*ETSIKMSPeerRequest) ProtoMessage() {}
 
-func (x *KMSPeerRequest) ProtoReflect() protoreflect.Message {
+func (x *ETSIKMSPeerRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -151,19 +151,19 @@ func (x *KMSPeerRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use KMSPeerRequest.ProtoReflect.Descriptor instead.
-func (*KMSPeerRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSIKMSPeerRequest.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeerRequest) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *KMSPeerRequest) GetKmsPeerSocket() string {
+func (x *ETSIKMSPeerRequest) GetKmsPeerSocket() string {
 	if x != nil {
 		return x.KmsPeerSocket
 	}
 	return ""
 }
 
-type KMSPeerReply struct {
+type ETSIKMSPeerReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -171,8 +171,8 @@ type KMSPeerReply struct {
 	KmsPeerName string `protobuf:"bytes,1,opt,name=kmsPeerName,proto3" json:"kmsPeerName,omitempty"`
 }
 
-func (x *KMSPeerReply) Reset() {
-	*x = KMSPeerReply{}
+func (x *ETSIKMSPeerReply) Reset() {
+	*x = ETSIKMSPeerReply{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -180,13 +180,13 @@ func (x *KMSPeerReply) Reset() {
 	}
 }
 
-func (x *KMSPeerReply) String() string {
+func (x *ETSIKMSPeerReply) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*KMSPeerReply) ProtoMessage() {}
+func (*ETSIKMSPeerReply) ProtoMessage() {}
 
-func (x *KMSPeerReply) ProtoReflect() protoreflect.Message {
+func (x *ETSIKMSPeerReply) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -198,19 +198,19 @@ func (x *KMSPeerReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use KMSPeerReply.ProtoReflect.Descriptor instead.
-func (*KMSPeerReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSIKMSPeerReply.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeerReply) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *KMSPeerReply) GetKmsPeerName() string {
+func (x *ETSIKMSPeerReply) GetKmsPeerName() string {
 	if x != nil {
 		return x.KmsPeerName
 	}
 	return ""
 }
 
-type GetEncryptKeys256BitRequest struct {
+type ETSIGetEncryptKeys256BitRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -218,8 +218,8 @@ type GetEncryptKeys256BitRequest struct {
 	Amount int64 `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
-func (x *GetEncryptKeys256BitRequest) Reset() {
-	*x = GetEncryptKeys256BitRequest{}
+func (x *ETSIGetEncryptKeys256BitRequest) Reset() {
+	*x = ETSIGetEncryptKeys256BitRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -227,13 +227,13 @@ func (x *GetEncryptKeys256BitRequest) Reset() {
 	}
 }
 
-func (x *GetEncryptKeys256BitRequest) String() string {
+func (x *ETSIGetEncryptKeys256BitRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetEncryptKeys256BitRequest) ProtoMessage() {}
+func (*ETSIGetEncryptKeys256BitRequest) ProtoMessage() {}
 
-func (x *GetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
+func (x *ETSIGetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -245,19 +245,19 @@ func (x *GetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetEncryptKeys256BitRequest.ProtoReflect.Descriptor instead.
-func (*GetEncryptKeys256BitRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSIGetEncryptKeys256BitRequest.ProtoReflect.Descriptor instead.
+func (*ETSIGetEncryptKeys256BitRequest) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *GetEncryptKeys256BitRequest) GetAmount() int64 {
+func (x *ETSIGetEncryptKeys256BitRequest) GetAmount() int64 {
 	if x != nil {
 		return x.Amount
 	}
 	return 0
 }
 
-type GetEncryptKeys256BitReply struct {
+type ETSIGetEncryptKeys256BitReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -266,8 +266,8 @@ type GetEncryptKeys256BitReply struct {
 	Key   []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
 }
 
-func (x *GetEncryptKeys256BitReply) Reset() {
-	*x = GetEncryptKeys256BitReply{}
+func (x *ETSIGetEncryptKeys256BitReply) Reset() {
+	*x = ETSIGetEncryptKeys256BitReply{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -275,13 +275,13 @@ func (x *GetEncryptKeys256BitReply) Reset() {
 	}
 }
 
-func (x *GetEncryptKeys256BitReply) String() string {
+func (x *ETSIGetEncryptKeys256BitReply) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetEncryptKeys256BitReply) ProtoMessage() {}
+func (*ETSIGetEncryptKeys256BitReply) ProtoMessage() {}
 
-func (x *GetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
+func (x *ETSIGetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -293,19 +293,19 @@ func (x *GetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetEncryptKeys256BitReply.ProtoReflect.Descriptor instead.
-func (*GetEncryptKeys256BitReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSIGetEncryptKeys256BitReply.ProtoReflect.Descriptor instead.
+func (*ETSIGetEncryptKeys256BitReply) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *GetEncryptKeys256BitReply) GetKeyID() string {
+func (x *ETSIGetEncryptKeys256BitReply) GetKeyID() string {
 	if x != nil {
 		return x.KeyID
 	}
 	return ""
 }
 
-func (x *GetEncryptKeys256BitReply) GetKey() []byte {
+func (x *ETSIGetEncryptKeys256BitReply) GetKey() []byte {
 	if x != nil {
 		return x.Key
 	}
@@ -317,54 +317,59 @@ var File_kmsetsiproto_proto protoreflect.FileDescriptor
 var file_kmsetsiproto_proto_rawDesc = []byte{
 	0x0a, 0x12, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x33, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69,
-	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x79, 0x4b,
-	0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x79,
-	0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x35, 0x0a, 0x11, 0x43, 0x61, 0x70, 0x61, 0x62,
-	0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b,
-	0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x36,
-	0x0a, 0x0e, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x24, 0x0a, 0x0d, 0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65, 0x72,
-	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x30, 0x0a, 0x0c, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
+	0x74, 0x6f, 0x22, 0x37, 0x0a, 0x17, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69,
+	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a,
+	0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x15, 0x45,
+	0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b,
+	0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3a, 0x0a, 0x12, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d,
+	0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d,
+	0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x22, 0x34, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
 	0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65,
 	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6b, 0x6d, 0x73,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x35, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x45,
-	0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22,
-	0x43, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79,
-	0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6b, 0x65, 0x79,
-	0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x32, 0xe4, 0x02, 0x0a, 0x07, 0x4b, 0x6d, 0x73, 0x45, 0x54, 0x53, 0x49,
-	0x12, 0x54, 0x0a, 0x0c, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73,
-	0x12, 0x21, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4b, 0x4d, 0x53,
-	0x50, 0x65, 0x65, 0x72, 0x12, 0x1c, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00,
-	0x12, 0x4b, 0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
-	0x72, 0x12, 0x1c, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x1a, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4b,
-	0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x6c, 0x0a,
-	0x14, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32,
-	0x35, 0x36, 0x42, 0x69, 0x74, 0x12, 0x29, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b,
-	0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x27, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x54, 0x53, 0x49,
 	0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35,
-	0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x37, 0x5a, 0x35, 0x63,
-	0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f,
-	0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f,
+	0x75, 0x6e, 0x74, 0x22, 0x47, 0x0a, 0x1d, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e,
+	0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0x94, 0x03, 0x0a,
+	0x07, 0x4b, 0x6d, 0x73, 0x45, 0x54, 0x53, 0x49, 0x12, 0x60, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49,
+	0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b,
+	0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49,
+	0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
+	0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x54, 0x0a, 0x0e, 0x45, 0x54,
+	0x53, 0x49, 0x41, 0x64, 0x64, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b,
+	0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49,
+	0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e,
+	0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54,
+	0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00,
+	0x12, 0x57, 0x0a, 0x11, 0x45, 0x54, 0x53, 0x49, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d,
+	0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73,
+	0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65,
+	0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x18, 0x45, 0x54, 0x53,
+	0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32,
+	0x35, 0x36, 0x42, 0x69, 0x74, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72,
+	0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79,
+	0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0x00, 0x42, 0x37, 0x5a, 0x35, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e,
+	0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65,
+	0x72, 0x6c, 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f,
+	0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -381,22 +386,22 @@ func file_kmsetsiproto_proto_rawDescGZIP() []byte {
 
 var file_kmsetsiproto_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_kmsetsiproto_proto_goTypes = []interface{}{
-	(*CapabilitiesRequest)(nil),         // 0: kmsetsiproto.CapabilitiesRequest
-	(*CapabilitiesReply)(nil),           // 1: kmsetsiproto.CapabilitiesReply
-	(*KMSPeerRequest)(nil),              // 2: kmsetsiproto.KMSPeerRequest
-	(*KMSPeerReply)(nil),                // 3: kmsetsiproto.KMSPeerReply
-	(*GetEncryptKeys256BitRequest)(nil), // 4: kmsetsiproto.GetEncryptKeys256BitRequest
-	(*GetEncryptKeys256BitReply)(nil),   // 5: kmsetsiproto.GetEncryptKeys256BitReply
+	(*ETSICapabilitiesRequest)(nil),         // 0: kmsetsiproto.ETSICapabilitiesRequest
+	(*ETSICapabilitiesReply)(nil),           // 1: kmsetsiproto.ETSICapabilitiesReply
+	(*ETSIKMSPeerRequest)(nil),              // 2: kmsetsiproto.ETSIKMSPeerRequest
+	(*ETSIKMSPeerReply)(nil),                // 3: kmsetsiproto.ETSIKMSPeerReply
+	(*ETSIGetEncryptKeys256BitRequest)(nil), // 4: kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+	(*ETSIGetEncryptKeys256BitReply)(nil),   // 5: kmsetsiproto.ETSIGetEncryptKeys256BitReply
 }
 var file_kmsetsiproto_proto_depIdxs = []int32{
-	0, // 0: kmsetsiproto.KmsETSI.Capabilities:input_type -> kmsetsiproto.CapabilitiesRequest
-	2, // 1: kmsetsiproto.KmsETSI.AddKMSPeer:input_type -> kmsetsiproto.KMSPeerRequest
-	2, // 2: kmsetsiproto.KmsETSI.RemoveKMSPeer:input_type -> kmsetsiproto.KMSPeerRequest
-	4, // 3: kmsetsiproto.KmsETSI.GetEncryptKeys256Bit:input_type -> kmsetsiproto.GetEncryptKeys256BitRequest
-	1, // 4: kmsetsiproto.KmsETSI.Capabilities:output_type -> kmsetsiproto.CapabilitiesReply
-	3, // 5: kmsetsiproto.KmsETSI.AddKMSPeer:output_type -> kmsetsiproto.KMSPeerReply
-	3, // 6: kmsetsiproto.KmsETSI.RemoveKMSPeer:output_type -> kmsetsiproto.KMSPeerReply
-	5, // 7: kmsetsiproto.KmsETSI.GetEncryptKeys256Bit:output_type -> kmsetsiproto.GetEncryptKeys256BitReply
+	0, // 0: kmsetsiproto.KmsETSI.ETSICapabilities:input_type -> kmsetsiproto.ETSICapabilitiesRequest
+	2, // 1: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
+	2, // 2: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
+	4, // 3: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:input_type -> kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+	1, // 4: kmsetsiproto.KmsETSI.ETSICapabilities:output_type -> kmsetsiproto.ETSICapabilitiesReply
+	3, // 5: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+	3, // 6: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+	5, // 7: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:output_type -> kmsetsiproto.ETSIGetEncryptKeys256BitReply
 	4, // [4:8] is the sub-list for method output_type
 	0, // [0:4] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -411,7 +416,7 @@ func file_kmsetsiproto_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_kmsetsiproto_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CapabilitiesRequest); i {
+			switch v := v.(*ETSICapabilitiesRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -423,7 +428,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CapabilitiesReply); i {
+			switch v := v.(*ETSICapabilitiesReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -435,7 +440,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KMSPeerRequest); i {
+			switch v := v.(*ETSIKMSPeerRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -447,7 +452,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KMSPeerReply); i {
+			switch v := v.(*ETSIKMSPeerReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -459,7 +464,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetEncryptKeys256BitRequest); i {
+			switch v := v.(*ETSIGetEncryptKeys256BitRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -471,7 +476,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetEncryptKeys256BitReply); i {
+			switch v := v.(*ETSIGetEncryptKeys256BitReply); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/kmsetsiproto/kmsetsiproto.proto b/kmsetsiproto/kmsetsiproto.proto
index c129e5956d7fa93ce4ba0c5328bc161a0c9eddbc..509ba95b4f9ad2838c1ab1e15104e2423966435c 100644
--- a/kmsetsiproto/kmsetsiproto.proto
+++ b/kmsetsiproto/kmsetsiproto.proto
@@ -6,32 +6,32 @@ package kmsetsiproto;
 
 service KmsETSI {
 	// Sends a greeting
-	rpc Capabilities (CapabilitiesRequest) returns (CapabilitiesReply) {}
-  rpc AddKMSPeer(KMSPeerRequest) returns (KMSPeerReply) {}
-  rpc RemoveKMSPeer(KMSPeerRequest) returns (KMSPeerReply) {}
-  rpc GetEncryptKeys256Bit (GetEncryptKeys256BitRequest) returns (GetEncryptKeys256BitReply) {}
+	rpc ETSICapabilities (ETSICapabilitiesRequest) returns (ETSICapabilitiesReply) {}
+  rpc ETSIAddKMSPeer(ETSIKMSPeerRequest) returns (ETSIKMSPeerReply) {}
+  rpc ETSIRemoveKMSPeer(ETSIKMSPeerRequest) returns (ETSIKMSPeerReply) {}
+  rpc ETSIGetEncryptKeys256Bit (ETSIGetEncryptKeys256BitRequest) returns (ETSIGetEncryptKeys256BitReply) {}
   }
 
   // The request message containing the user's name.
-message CapabilitiesRequest {
+message ETSICapabilitiesRequest {
 	string myKmsName = 1;
   }
   
   // The response message containing the greetings
-  message CapabilitiesReply {
+  message ETSICapabilitiesReply {
 	string peerKmsName= 1;
   }
 
-message KMSPeerRequest {
+message ETSIKMSPeerRequest {
   string kmsPeerSocket = 1;
 }
 
-message KMSPeerReply {
+message ETSIKMSPeerReply {
   string kmsPeerName  = 1;
 }
 
 
-message GetEncryptKeys256BitRequest {
+message ETSIGetEncryptKeys256BitRequest {
   int64 amount = 1;
 }
 
@@ -43,7 +43,7 @@ message GetEncryptKeys256BitRequest {
  *  }
  */
 
-message GetEncryptKeys256BitReply {
+message ETSIGetEncryptKeys256BitReply {
   string keyID = 1;
   bytes key = 2;
 }
diff --git a/kmsetsiproto/kmsetsiproto_grpc.pb.go b/kmsetsiproto/kmsetsiproto_grpc.pb.go
index d4e0fb12530c1bc9004def37b9217d2507f91f49..4ad7251e415f8f64ecbba729051f13e4dddce8d6 100644
--- a/kmsetsiproto/kmsetsiproto_grpc.pb.go
+++ b/kmsetsiproto/kmsetsiproto_grpc.pb.go
@@ -23,10 +23,10 @@ const _ = grpc.SupportPackageIsVersion7
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type KmsETSIClient interface {
 	// Sends a greeting
-	Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesReply, error)
-	AddKMSPeer(ctx context.Context, in *KMSPeerRequest, opts ...grpc.CallOption) (*KMSPeerReply, error)
-	RemoveKMSPeer(ctx context.Context, in *KMSPeerRequest, opts ...grpc.CallOption) (*KMSPeerReply, error)
-	GetEncryptKeys256Bit(ctx context.Context, in *GetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*GetEncryptKeys256BitReply, error)
+	ETSICapabilities(ctx context.Context, in *ETSICapabilitiesRequest, opts ...grpc.CallOption) (*ETSICapabilitiesReply, error)
+	ETSIAddKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error)
+	ETSIRemoveKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error)
+	ETSIGetEncryptKeys256Bit(ctx context.Context, in *ETSIGetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*ETSIGetEncryptKeys256BitReply, error)
 }
 
 type kmsETSIClient struct {
@@ -37,36 +37,36 @@ func NewKmsETSIClient(cc grpc.ClientConnInterface) KmsETSIClient {
 	return &kmsETSIClient{cc}
 }
 
-func (c *kmsETSIClient) Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesReply, error) {
-	out := new(CapabilitiesReply)
-	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/Capabilities", in, out, opts...)
+func (c *kmsETSIClient) ETSICapabilities(ctx context.Context, in *ETSICapabilitiesRequest, opts ...grpc.CallOption) (*ETSICapabilitiesReply, error) {
+	out := new(ETSICapabilitiesReply)
+	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSICapabilities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *kmsETSIClient) AddKMSPeer(ctx context.Context, in *KMSPeerRequest, opts ...grpc.CallOption) (*KMSPeerReply, error) {
-	out := new(KMSPeerReply)
-	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/AddKMSPeer", in, out, opts...)
+func (c *kmsETSIClient) ETSIAddKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error) {
+	out := new(ETSIKMSPeerReply)
+	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSIAddKMSPeer", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *kmsETSIClient) RemoveKMSPeer(ctx context.Context, in *KMSPeerRequest, opts ...grpc.CallOption) (*KMSPeerReply, error) {
-	out := new(KMSPeerReply)
-	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/RemoveKMSPeer", in, out, opts...)
+func (c *kmsETSIClient) ETSIRemoveKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error) {
+	out := new(ETSIKMSPeerReply)
+	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSIRemoveKMSPeer", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *kmsETSIClient) GetEncryptKeys256Bit(ctx context.Context, in *GetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*GetEncryptKeys256BitReply, error) {
-	out := new(GetEncryptKeys256BitReply)
-	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/GetEncryptKeys256Bit", in, out, opts...)
+func (c *kmsETSIClient) ETSIGetEncryptKeys256Bit(ctx context.Context, in *ETSIGetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*ETSIGetEncryptKeys256BitReply, error) {
+	out := new(ETSIGetEncryptKeys256BitReply)
+	err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSIGetEncryptKeys256Bit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -78,10 +78,10 @@ func (c *kmsETSIClient) GetEncryptKeys256Bit(ctx context.Context, in *GetEncrypt
 // for forward compatibility
 type KmsETSIServer interface {
 	// Sends a greeting
-	Capabilities(context.Context, *CapabilitiesRequest) (*CapabilitiesReply, error)
-	AddKMSPeer(context.Context, *KMSPeerRequest) (*KMSPeerReply, error)
-	RemoveKMSPeer(context.Context, *KMSPeerRequest) (*KMSPeerReply, error)
-	GetEncryptKeys256Bit(context.Context, *GetEncryptKeys256BitRequest) (*GetEncryptKeys256BitReply, error)
+	ETSICapabilities(context.Context, *ETSICapabilitiesRequest) (*ETSICapabilitiesReply, error)
+	ETSIAddKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error)
+	ETSIRemoveKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error)
+	ETSIGetEncryptKeys256Bit(context.Context, *ETSIGetEncryptKeys256BitRequest) (*ETSIGetEncryptKeys256BitReply, error)
 	mustEmbedUnimplementedKmsETSIServer()
 }
 
@@ -89,17 +89,17 @@ type KmsETSIServer interface {
 type UnimplementedKmsETSIServer struct {
 }
 
-func (UnimplementedKmsETSIServer) Capabilities(context.Context, *CapabilitiesRequest) (*CapabilitiesReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Capabilities not implemented")
+func (UnimplementedKmsETSIServer) ETSICapabilities(context.Context, *ETSICapabilitiesRequest) (*ETSICapabilitiesReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ETSICapabilities not implemented")
 }
-func (UnimplementedKmsETSIServer) AddKMSPeer(context.Context, *KMSPeerRequest) (*KMSPeerReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AddKMSPeer not implemented")
+func (UnimplementedKmsETSIServer) ETSIAddKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ETSIAddKMSPeer not implemented")
 }
-func (UnimplementedKmsETSIServer) RemoveKMSPeer(context.Context, *KMSPeerRequest) (*KMSPeerReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RemoveKMSPeer not implemented")
+func (UnimplementedKmsETSIServer) ETSIRemoveKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ETSIRemoveKMSPeer not implemented")
 }
-func (UnimplementedKmsETSIServer) GetEncryptKeys256Bit(context.Context, *GetEncryptKeys256BitRequest) (*GetEncryptKeys256BitReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetEncryptKeys256Bit not implemented")
+func (UnimplementedKmsETSIServer) ETSIGetEncryptKeys256Bit(context.Context, *ETSIGetEncryptKeys256BitRequest) (*ETSIGetEncryptKeys256BitReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ETSIGetEncryptKeys256Bit not implemented")
 }
 func (UnimplementedKmsETSIServer) mustEmbedUnimplementedKmsETSIServer() {}
 
@@ -114,74 +114,74 @@ func RegisterKmsETSIServer(s grpc.ServiceRegistrar, srv KmsETSIServer) {
 	s.RegisterService(&KmsETSI_ServiceDesc, srv)
 }
 
-func _KmsETSI_Capabilities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CapabilitiesRequest)
+func _KmsETSI_ETSICapabilities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ETSICapabilitiesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsETSIServer).Capabilities(ctx, in)
+		return srv.(KmsETSIServer).ETSICapabilities(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsetsiproto.KmsETSI/Capabilities",
+		FullMethod: "/kmsetsiproto.KmsETSI/ETSICapabilities",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsETSIServer).Capabilities(ctx, req.(*CapabilitiesRequest))
+		return srv.(KmsETSIServer).ETSICapabilities(ctx, req.(*ETSICapabilitiesRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _KmsETSI_AddKMSPeer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(KMSPeerRequest)
+func _KmsETSI_ETSIAddKMSPeer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ETSIKMSPeerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsETSIServer).AddKMSPeer(ctx, in)
+		return srv.(KmsETSIServer).ETSIAddKMSPeer(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsetsiproto.KmsETSI/AddKMSPeer",
+		FullMethod: "/kmsetsiproto.KmsETSI/ETSIAddKMSPeer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsETSIServer).AddKMSPeer(ctx, req.(*KMSPeerRequest))
+		return srv.(KmsETSIServer).ETSIAddKMSPeer(ctx, req.(*ETSIKMSPeerRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _KmsETSI_RemoveKMSPeer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(KMSPeerRequest)
+func _KmsETSI_ETSIRemoveKMSPeer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ETSIKMSPeerRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsETSIServer).RemoveKMSPeer(ctx, in)
+		return srv.(KmsETSIServer).ETSIRemoveKMSPeer(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsetsiproto.KmsETSI/RemoveKMSPeer",
+		FullMethod: "/kmsetsiproto.KmsETSI/ETSIRemoveKMSPeer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsETSIServer).RemoveKMSPeer(ctx, req.(*KMSPeerRequest))
+		return srv.(KmsETSIServer).ETSIRemoveKMSPeer(ctx, req.(*ETSIKMSPeerRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _KmsETSI_GetEncryptKeys256Bit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetEncryptKeys256BitRequest)
+func _KmsETSI_ETSIGetEncryptKeys256Bit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ETSIGetEncryptKeys256BitRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsETSIServer).GetEncryptKeys256Bit(ctx, in)
+		return srv.(KmsETSIServer).ETSIGetEncryptKeys256Bit(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsetsiproto.KmsETSI/GetEncryptKeys256Bit",
+		FullMethod: "/kmsetsiproto.KmsETSI/ETSIGetEncryptKeys256Bit",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsETSIServer).GetEncryptKeys256Bit(ctx, req.(*GetEncryptKeys256BitRequest))
+		return srv.(KmsETSIServer).ETSIGetEncryptKeys256Bit(ctx, req.(*ETSIGetEncryptKeys256BitRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -194,20 +194,20 @@ var KmsETSI_ServiceDesc = grpc.ServiceDesc{
 	HandlerType: (*KmsETSIServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "Capabilities",
-			Handler:    _KmsETSI_Capabilities_Handler,
+			MethodName: "ETSICapabilities",
+			Handler:    _KmsETSI_ETSICapabilities_Handler,
 		},
 		{
-			MethodName: "AddKMSPeer",
-			Handler:    _KmsETSI_AddKMSPeer_Handler,
+			MethodName: "ETSIAddKMSPeer",
+			Handler:    _KmsETSI_ETSIAddKMSPeer_Handler,
 		},
 		{
-			MethodName: "RemoveKMSPeer",
-			Handler:    _KmsETSI_RemoveKMSPeer_Handler,
+			MethodName: "ETSIRemoveKMSPeer",
+			Handler:    _KmsETSI_ETSIRemoveKMSPeer_Handler,
 		},
 		{
-			MethodName: "GetEncryptKeys256Bit",
-			Handler:    _KmsETSI_GetEncryptKeys256Bit_Handler,
+			MethodName: "ETSIGetEncryptKeys256Bit",
+			Handler:    _KmsETSI_ETSIGetEncryptKeys256Bit_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/kmsintercomproto/kmsintercom.pb.go b/kmsintercomproto/kmsintercom.pb.go
index 968e7263bbe8c001cf47d4caf65affcf3df18625..400cd7a3b25cac14474bf76d6470448ac5d4225f 100644
--- a/kmsintercomproto/kmsintercom.pb.go
+++ b/kmsintercomproto/kmsintercom.pb.go
@@ -22,7 +22,7 @@ const (
 
 // Capabilities
 // The request message containing the requesting kms' name.
-type CapabilitiesRequest struct {
+type InterComCapabilitiesRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -30,8 +30,8 @@ type CapabilitiesRequest struct {
 	MyKmsName string `protobuf:"bytes,1,opt,name=myKmsName,proto3" json:"myKmsName,omitempty"`
 }
 
-func (x *CapabilitiesRequest) Reset() {
-	*x = CapabilitiesRequest{}
+func (x *InterComCapabilitiesRequest) Reset() {
+	*x = InterComCapabilitiesRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsintercom_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -39,13 +39,13 @@ func (x *CapabilitiesRequest) Reset() {
 	}
 }
 
-func (x *CapabilitiesRequest) String() string {
+func (x *InterComCapabilitiesRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CapabilitiesRequest) ProtoMessage() {}
+func (*InterComCapabilitiesRequest) ProtoMessage() {}
 
-func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
+func (x *InterComCapabilitiesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsintercom_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -57,12 +57,12 @@ func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CapabilitiesRequest.ProtoReflect.Descriptor instead.
-func (*CapabilitiesRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use InterComCapabilitiesRequest.ProtoReflect.Descriptor instead.
+func (*InterComCapabilitiesRequest) Descriptor() ([]byte, []int) {
 	return file_kmsintercom_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *CapabilitiesRequest) GetMyKmsName() string {
+func (x *InterComCapabilitiesRequest) GetMyKmsName() string {
 	if x != nil {
 		return x.MyKmsName
 	}
@@ -70,7 +70,7 @@ func (x *CapabilitiesRequest) GetMyKmsName() string {
 }
 
 // The response message containing the replying kms' name.
-type CapabilitiesReply struct {
+type InterComCapabilitiesReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -78,8 +78,8 @@ type CapabilitiesReply struct {
 	PeerKmsName string `protobuf:"bytes,1,opt,name=peerKmsName,proto3" json:"peerKmsName,omitempty"`
 }
 
-func (x *CapabilitiesReply) Reset() {
-	*x = CapabilitiesReply{}
+func (x *InterComCapabilitiesReply) Reset() {
+	*x = InterComCapabilitiesReply{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsintercom_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -87,13 +87,13 @@ func (x *CapabilitiesReply) Reset() {
 	}
 }
 
-func (x *CapabilitiesReply) String() string {
+func (x *InterComCapabilitiesReply) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CapabilitiesReply) ProtoMessage() {}
+func (*InterComCapabilitiesReply) ProtoMessage() {}
 
-func (x *CapabilitiesReply) ProtoReflect() protoreflect.Message {
+func (x *InterComCapabilitiesReply) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsintercom_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -105,12 +105,12 @@ func (x *CapabilitiesReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CapabilitiesReply.ProtoReflect.Descriptor instead.
-func (*CapabilitiesReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use InterComCapabilitiesReply.ProtoReflect.Descriptor instead.
+func (*InterComCapabilitiesReply) Descriptor() ([]byte, []int) {
 	return file_kmsintercom_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *CapabilitiesReply) GetPeerKmsName() string {
+func (x *InterComCapabilitiesReply) GetPeerKmsName() string {
 	if x != nil {
 		return x.PeerKmsName
 	}
@@ -119,7 +119,7 @@ func (x *CapabilitiesReply) GetPeerKmsName() string {
 
 // KeyTransportSessionHandling
 // The request message containing the requesting kms' name.
-type KeyTransportSessionHandlingRequest struct {
+type InterComKeyTransportSessionHandlingRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -127,8 +127,8 @@ type KeyTransportSessionHandlingRequest struct {
 	MyKmsName string `protobuf:"bytes,1,opt,name=myKmsName,proto3" json:"myKmsName,omitempty"`
 }
 
-func (x *KeyTransportSessionHandlingRequest) Reset() {
-	*x = KeyTransportSessionHandlingRequest{}
+func (x *InterComKeyTransportSessionHandlingRequest) Reset() {
+	*x = InterComKeyTransportSessionHandlingRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsintercom_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -136,13 +136,13 @@ func (x *KeyTransportSessionHandlingRequest) Reset() {
 	}
 }
 
-func (x *KeyTransportSessionHandlingRequest) String() string {
+func (x *InterComKeyTransportSessionHandlingRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*KeyTransportSessionHandlingRequest) ProtoMessage() {}
+func (*InterComKeyTransportSessionHandlingRequest) ProtoMessage() {}
 
-func (x *KeyTransportSessionHandlingRequest) ProtoReflect() protoreflect.Message {
+func (x *InterComKeyTransportSessionHandlingRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsintercom_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -154,12 +154,12 @@ func (x *KeyTransportSessionHandlingRequest) ProtoReflect() protoreflect.Message
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use KeyTransportSessionHandlingRequest.ProtoReflect.Descriptor instead.
-func (*KeyTransportSessionHandlingRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use InterComKeyTransportSessionHandlingRequest.ProtoReflect.Descriptor instead.
+func (*InterComKeyTransportSessionHandlingRequest) Descriptor() ([]byte, []int) {
 	return file_kmsintercom_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *KeyTransportSessionHandlingRequest) GetMyKmsName() string {
+func (x *InterComKeyTransportSessionHandlingRequest) GetMyKmsName() string {
 	if x != nil {
 		return x.MyKmsName
 	}
@@ -167,7 +167,7 @@ func (x *KeyTransportSessionHandlingRequest) GetMyKmsName() string {
 }
 
 // The response message containing the replying kms' name.
-type KeyTransportSessionHandlingReply struct {
+type InterComKeyTransportSessionHandlingReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -175,8 +175,8 @@ type KeyTransportSessionHandlingReply struct {
 	PeerKmsName string `protobuf:"bytes,1,opt,name=peerKmsName,proto3" json:"peerKmsName,omitempty"`
 }
 
-func (x *KeyTransportSessionHandlingReply) Reset() {
-	*x = KeyTransportSessionHandlingReply{}
+func (x *InterComKeyTransportSessionHandlingReply) Reset() {
+	*x = InterComKeyTransportSessionHandlingReply{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsintercom_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -184,13 +184,13 @@ func (x *KeyTransportSessionHandlingReply) Reset() {
 	}
 }
 
-func (x *KeyTransportSessionHandlingReply) String() string {
+func (x *InterComKeyTransportSessionHandlingReply) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*KeyTransportSessionHandlingReply) ProtoMessage() {}
+func (*InterComKeyTransportSessionHandlingReply) ProtoMessage() {}
 
-func (x *KeyTransportSessionHandlingReply) ProtoReflect() protoreflect.Message {
+func (x *InterComKeyTransportSessionHandlingReply) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsintercom_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -202,12 +202,12 @@ func (x *KeyTransportSessionHandlingReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use KeyTransportSessionHandlingReply.ProtoReflect.Descriptor instead.
-func (*KeyTransportSessionHandlingReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use InterComKeyTransportSessionHandlingReply.ProtoReflect.Descriptor instead.
+func (*InterComKeyTransportSessionHandlingReply) Descriptor() ([]byte, []int) {
 	return file_kmsintercom_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *KeyTransportSessionHandlingReply) GetPeerKmsName() string {
+func (x *InterComKeyTransportSessionHandlingReply) GetPeerKmsName() string {
 	if x != nil {
 		return x.PeerKmsName
 	}
@@ -219,36 +219,41 @@ var File_kmsintercom_proto protoreflect.FileDescriptor
 var file_kmsintercom_proto_rawDesc = []byte{
 	0x0a, 0x11, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x12, 0x10, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x33, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c,
-	0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09,
-	0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x35, 0x0a, 0x11, 0x43, 0x61,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x1b, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f,
+	0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61,
+	0x6d, 0x65, 0x22, 0x3d, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61,
 	0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
 	0x20, 0x0a, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d,
-	0x65, 0x22, 0x42, 0x0a, 0x22, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x79, 0x4b, 0x6d,
-	0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x20, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e,
+	0x65, 0x22, 0x4a, 0x0a, 0x2a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1c, 0x0a, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x4c, 0x0a,
+	0x28, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e,
 	0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64,
 	0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x65, 0x65,
 	0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0xf5, 0x01, 0x0a, 0x09,
-	0x4b, 0x6d, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x5c, 0x0a, 0x0c, 0x43, 0x61, 0x70,
-	0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x70,
+	0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0xa5, 0x02, 0x0a, 0x09,
+	0x4b, 0x6d, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x74, 0x0a, 0x14, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65,
+	0x73, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70,
 	0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x89, 0x01, 0x0a, 0x1b, 0x4b, 0x65, 0x79, 0x54,
+	0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61,
+	0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12,
+	0xa1, 0x01, 0x0a, 0x23, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54,
 	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48,
-	0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x34, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4b, 0x65, 0x79, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61,
-	0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e,
-	0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73,
+	0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f,
+	0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73,
 	0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c,
 	0x79, 0x22, 0x00, 0x42, 0x3b, 0x5a, 0x39, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e,
 	0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65,
@@ -271,16 +276,16 @@ func file_kmsintercom_proto_rawDescGZIP() []byte {
 
 var file_kmsintercom_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_kmsintercom_proto_goTypes = []interface{}{
-	(*CapabilitiesRequest)(nil),                // 0: kmsintercomproto.CapabilitiesRequest
-	(*CapabilitiesReply)(nil),                  // 1: kmsintercomproto.CapabilitiesReply
-	(*KeyTransportSessionHandlingRequest)(nil), // 2: kmsintercomproto.KeyTransportSessionHandlingRequest
-	(*KeyTransportSessionHandlingReply)(nil),   // 3: kmsintercomproto.KeyTransportSessionHandlingReply
+	(*InterComCapabilitiesRequest)(nil),                // 0: kmsintercomproto.InterComCapabilitiesRequest
+	(*InterComCapabilitiesReply)(nil),                  // 1: kmsintercomproto.InterComCapabilitiesReply
+	(*InterComKeyTransportSessionHandlingRequest)(nil), // 2: kmsintercomproto.InterComKeyTransportSessionHandlingRequest
+	(*InterComKeyTransportSessionHandlingReply)(nil),   // 3: kmsintercomproto.InterComKeyTransportSessionHandlingReply
 }
 var file_kmsintercom_proto_depIdxs = []int32{
-	0, // 0: kmsintercomproto.KmsTalker.Capabilities:input_type -> kmsintercomproto.CapabilitiesRequest
-	2, // 1: kmsintercomproto.KmsTalker.KeyTransportSessionHandling:input_type -> kmsintercomproto.KeyTransportSessionHandlingRequest
-	1, // 2: kmsintercomproto.KmsTalker.Capabilities:output_type -> kmsintercomproto.CapabilitiesReply
-	3, // 3: kmsintercomproto.KmsTalker.KeyTransportSessionHandling:output_type -> kmsintercomproto.KeyTransportSessionHandlingReply
+	0, // 0: kmsintercomproto.KmsTalker.InterComCapabilities:input_type -> kmsintercomproto.InterComCapabilitiesRequest
+	2, // 1: kmsintercomproto.KmsTalker.InterComKeyTransportSessionHandling:input_type -> kmsintercomproto.InterComKeyTransportSessionHandlingRequest
+	1, // 2: kmsintercomproto.KmsTalker.InterComCapabilities:output_type -> kmsintercomproto.InterComCapabilitiesReply
+	3, // 3: kmsintercomproto.KmsTalker.InterComKeyTransportSessionHandling:output_type -> kmsintercomproto.InterComKeyTransportSessionHandlingReply
 	2, // [2:4] is the sub-list for method output_type
 	0, // [0:2] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -295,7 +300,7 @@ func file_kmsintercom_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_kmsintercom_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CapabilitiesRequest); i {
+			switch v := v.(*InterComCapabilitiesRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -307,7 +312,7 @@ func file_kmsintercom_proto_init() {
 			}
 		}
 		file_kmsintercom_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CapabilitiesReply); i {
+			switch v := v.(*InterComCapabilitiesReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -319,7 +324,7 @@ func file_kmsintercom_proto_init() {
 			}
 		}
 		file_kmsintercom_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeyTransportSessionHandlingRequest); i {
+			switch v := v.(*InterComKeyTransportSessionHandlingRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -331,7 +336,7 @@ func file_kmsintercom_proto_init() {
 			}
 		}
 		file_kmsintercom_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeyTransportSessionHandlingReply); i {
+			switch v := v.(*InterComKeyTransportSessionHandlingReply); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/kmsintercomproto/kmsintercom.proto b/kmsintercomproto/kmsintercom.proto
index 782d6b3a91538948ec112f89adf58a9aeab8a09f..e7123d6074ee2b49446f1d52559c29408ead6b42 100644
--- a/kmsintercomproto/kmsintercom.proto
+++ b/kmsintercomproto/kmsintercom.proto
@@ -5,30 +5,29 @@ option go_package = "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsintercomproto";
 package kmsintercomproto;
 
 service KmsTalker {
-	// Sends a greeting
-	rpc Capabilities (CapabilitiesRequest) returns (CapabilitiesReply) {}
-  rpc KeyTransportSessionHandling(KeyTransportSessionHandlingRequest) returns (KeyTransportSessionHandlingReply) {}
-  }
+	rpc InterComCapabilities (InterComCapabilitiesRequest) returns (InterComCapabilitiesReply) {}
+	rpc InterComKeyTransportSessionHandling(InterComKeyTransportSessionHandlingRequest) returns (InterComKeyTransportSessionHandlingReply) {}
+}
 
 // Capabilities
 // The request message containing the requesting kms' name.
-message CapabilitiesRequest {
+message InterComCapabilitiesRequest {
 	string myKmsName = 1;
   }
   
 // The response message containing the replying kms' name.
-message CapabilitiesReply {
+message InterComCapabilitiesReply {
 	string peerKmsName= 1;
 }
 
 // KeyTransportSessionHandling
 // The request message containing the requesting kms' name.
-message KeyTransportSessionHandlingRequest {
+message InterComKeyTransportSessionHandlingRequest {
 	string myKmsName = 1;
   }
   
 // The response message containing the replying kms' name.
-message KeyTransportSessionHandlingReply {
+message InterComKeyTransportSessionHandlingReply {
 	string peerKmsName= 1;
 }
 
diff --git a/kmsintercomproto/kmsintercom_grpc.pb.go b/kmsintercomproto/kmsintercom_grpc.pb.go
index 3f9ada5a40b09228a1713cda3f536ddb16e1f6b9..d630de3ab1e454f855c9dbc5f0b07e72ecfe28c0 100644
--- a/kmsintercomproto/kmsintercom_grpc.pb.go
+++ b/kmsintercomproto/kmsintercom_grpc.pb.go
@@ -22,9 +22,8 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type KmsTalkerClient interface {
-	// Sends a greeting
-	Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesReply, error)
-	KeyTransportSessionHandling(ctx context.Context, in *KeyTransportSessionHandlingRequest, opts ...grpc.CallOption) (*KeyTransportSessionHandlingReply, error)
+	InterComCapabilities(ctx context.Context, in *InterComCapabilitiesRequest, opts ...grpc.CallOption) (*InterComCapabilitiesReply, error)
+	InterComKeyTransportSessionHandling(ctx context.Context, in *InterComKeyTransportSessionHandlingRequest, opts ...grpc.CallOption) (*InterComKeyTransportSessionHandlingReply, error)
 }
 
 type kmsTalkerClient struct {
@@ -35,18 +34,18 @@ func NewKmsTalkerClient(cc grpc.ClientConnInterface) KmsTalkerClient {
 	return &kmsTalkerClient{cc}
 }
 
-func (c *kmsTalkerClient) Capabilities(ctx context.Context, in *CapabilitiesRequest, opts ...grpc.CallOption) (*CapabilitiesReply, error) {
-	out := new(CapabilitiesReply)
-	err := c.cc.Invoke(ctx, "/kmsintercomproto.KmsTalker/Capabilities", in, out, opts...)
+func (c *kmsTalkerClient) InterComCapabilities(ctx context.Context, in *InterComCapabilitiesRequest, opts ...grpc.CallOption) (*InterComCapabilitiesReply, error) {
+	out := new(InterComCapabilitiesReply)
+	err := c.cc.Invoke(ctx, "/kmsintercomproto.KmsTalker/InterComCapabilities", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *kmsTalkerClient) KeyTransportSessionHandling(ctx context.Context, in *KeyTransportSessionHandlingRequest, opts ...grpc.CallOption) (*KeyTransportSessionHandlingReply, error) {
-	out := new(KeyTransportSessionHandlingReply)
-	err := c.cc.Invoke(ctx, "/kmsintercomproto.KmsTalker/KeyTransportSessionHandling", in, out, opts...)
+func (c *kmsTalkerClient) InterComKeyTransportSessionHandling(ctx context.Context, in *InterComKeyTransportSessionHandlingRequest, opts ...grpc.CallOption) (*InterComKeyTransportSessionHandlingReply, error) {
+	out := new(InterComKeyTransportSessionHandlingReply)
+	err := c.cc.Invoke(ctx, "/kmsintercomproto.KmsTalker/InterComKeyTransportSessionHandling", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -57,9 +56,8 @@ func (c *kmsTalkerClient) KeyTransportSessionHandling(ctx context.Context, in *K
 // All implementations must embed UnimplementedKmsTalkerServer
 // for forward compatibility
 type KmsTalkerServer interface {
-	// Sends a greeting
-	Capabilities(context.Context, *CapabilitiesRequest) (*CapabilitiesReply, error)
-	KeyTransportSessionHandling(context.Context, *KeyTransportSessionHandlingRequest) (*KeyTransportSessionHandlingReply, error)
+	InterComCapabilities(context.Context, *InterComCapabilitiesRequest) (*InterComCapabilitiesReply, error)
+	InterComKeyTransportSessionHandling(context.Context, *InterComKeyTransportSessionHandlingRequest) (*InterComKeyTransportSessionHandlingReply, error)
 	mustEmbedUnimplementedKmsTalkerServer()
 }
 
@@ -67,11 +65,11 @@ type KmsTalkerServer interface {
 type UnimplementedKmsTalkerServer struct {
 }
 
-func (UnimplementedKmsTalkerServer) Capabilities(context.Context, *CapabilitiesRequest) (*CapabilitiesReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Capabilities not implemented")
+func (UnimplementedKmsTalkerServer) InterComCapabilities(context.Context, *InterComCapabilitiesRequest) (*InterComCapabilitiesReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method InterComCapabilities not implemented")
 }
-func (UnimplementedKmsTalkerServer) KeyTransportSessionHandling(context.Context, *KeyTransportSessionHandlingRequest) (*KeyTransportSessionHandlingReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method KeyTransportSessionHandling not implemented")
+func (UnimplementedKmsTalkerServer) InterComKeyTransportSessionHandling(context.Context, *InterComKeyTransportSessionHandlingRequest) (*InterComKeyTransportSessionHandlingReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method InterComKeyTransportSessionHandling not implemented")
 }
 func (UnimplementedKmsTalkerServer) mustEmbedUnimplementedKmsTalkerServer() {}
 
@@ -86,38 +84,38 @@ func RegisterKmsTalkerServer(s grpc.ServiceRegistrar, srv KmsTalkerServer) {
 	s.RegisterService(&KmsTalker_ServiceDesc, srv)
 }
 
-func _KmsTalker_Capabilities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CapabilitiesRequest)
+func _KmsTalker_InterComCapabilities_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InterComCapabilitiesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsTalkerServer).Capabilities(ctx, in)
+		return srv.(KmsTalkerServer).InterComCapabilities(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsintercomproto.KmsTalker/Capabilities",
+		FullMethod: "/kmsintercomproto.KmsTalker/InterComCapabilities",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsTalkerServer).Capabilities(ctx, req.(*CapabilitiesRequest))
+		return srv.(KmsTalkerServer).InterComCapabilities(ctx, req.(*InterComCapabilitiesRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _KmsTalker_KeyTransportSessionHandling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(KeyTransportSessionHandlingRequest)
+func _KmsTalker_InterComKeyTransportSessionHandling_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InterComKeyTransportSessionHandlingRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(KmsTalkerServer).KeyTransportSessionHandling(ctx, in)
+		return srv.(KmsTalkerServer).InterComKeyTransportSessionHandling(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/kmsintercomproto.KmsTalker/KeyTransportSessionHandling",
+		FullMethod: "/kmsintercomproto.KmsTalker/InterComKeyTransportSessionHandling",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(KmsTalkerServer).KeyTransportSessionHandling(ctx, req.(*KeyTransportSessionHandlingRequest))
+		return srv.(KmsTalkerServer).InterComKeyTransportSessionHandling(ctx, req.(*InterComKeyTransportSessionHandlingRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -130,12 +128,12 @@ var KmsTalker_ServiceDesc = grpc.ServiceDesc{
 	HandlerType: (*KmsTalkerServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "Capabilities",
-			Handler:    _KmsTalker_Capabilities_Handler,
+			MethodName: "InterComCapabilities",
+			Handler:    _KmsTalker_InterComCapabilities_Handler,
 		},
 		{
-			MethodName: "KeyTransportSessionHandling",
-			Handler:    _KmsTalker_KeyTransportSessionHandling_Handler,
+			MethodName: "InterComKeyTransportSessionHandling",
+			Handler:    _KmsTalker_InterComKeyTransportSessionHandling_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},