diff --git a/buf.gen.yaml b/buf.gen.yaml
index 79efe75afbefc2df14f30f322efd62a4b0b983f4..d5e0b8c717c46719db54857d9f848f780275d28c 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: code.fbi.h-da.de/danet/quicsep/gen/go
+    default: code.fbi.h-da.de/danet/quipsec/gen/go
     except:
       - buf.build/bufbuild/protovalidate
 plugins:
diff --git a/gen/go/quicsep/go.mod b/gen/go/quipsec/go.mod
similarity index 89%
rename from gen/go/quicsep/go.mod
rename to gen/go/quipsec/go.mod
index 16ea3b7d28efa2a34cb121e063faf0c6247955aa..1627063efcc2daa2eb0b373a3244c6a6bf8d905f 100644
--- a/gen/go/quicsep/go.mod
+++ b/gen/go/quipsec/go.mod
@@ -1,4 +1,4 @@
-module code.fbi.h-da.de/danet/quicsep/gen/go/quicsep
+module code.fbi.h-da.de/danet/quipsec/gen/go/quipsec
 
 go 1.21
 
diff --git a/gen/go/quicsep/go.sum b/gen/go/quipsec/go.sum
similarity index 100%
rename from gen/go/quicsep/go.sum
rename to gen/go/quipsec/go.sum
diff --git a/gen/go/quicsep/quicsep.pb.go b/gen/go/quipsec/quipsec.pb.go
similarity index 88%
rename from gen/go/quicsep/quicsep.pb.go
rename to gen/go/quipsec/quipsec.pb.go
index e2e49e956d3342d58c98ecb6146aa6f3cd981dde..4bc0e61c1531ac887f7686c58c2d596f9729aaac 100644
--- a/gen/go/quicsep/quicsep.pb.go
+++ b/gen/go/quipsec/quipsec.pb.go
@@ -4,7 +4,7 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        (unknown)
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 package quipsecv1
 
@@ -39,7 +39,7 @@ type Metadata struct {
 func (x *Metadata) Reset() {
 	*x = Metadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[0]
+		mi := &file_quipsec_quipsec_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -52,7 +52,7 @@ func (x *Metadata) String() string {
 func (*Metadata) ProtoMessage() {}
 
 func (x *Metadata) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[0]
+	mi := &file_quipsec_quipsec_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -65,7 +65,7 @@ func (x *Metadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Metadata.ProtoReflect.Descriptor instead.
 func (*Metadata) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{0}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Metadata) GetTimestamp() int64 {
@@ -125,7 +125,7 @@ type KeyBulk struct {
 func (x *KeyBulk) Reset() {
 	*x = KeyBulk{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[1]
+		mi := &file_quipsec_quipsec_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -138,7 +138,7 @@ func (x *KeyBulk) String() string {
 func (*KeyBulk) ProtoMessage() {}
 
 func (x *KeyBulk) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[1]
+	mi := &file_quipsec_quipsec_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -151,7 +151,7 @@ func (x *KeyBulk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use KeyBulk.ProtoReflect.Descriptor instead.
 func (*KeyBulk) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{1}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *KeyBulk) GetKeyId() string {
@@ -201,7 +201,7 @@ type CapabilitiesRequest struct {
 func (x *CapabilitiesRequest) Reset() {
 	*x = CapabilitiesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[2]
+		mi := &file_quipsec_quipsec_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -214,7 +214,7 @@ func (x *CapabilitiesRequest) String() string {
 func (*CapabilitiesRequest) ProtoMessage() {}
 
 func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[2]
+	mi := &file_quipsec_quipsec_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -227,7 +227,7 @@ func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CapabilitiesRequest.ProtoReflect.Descriptor instead.
 func (*CapabilitiesRequest) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{2}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *CapabilitiesRequest) GetTimestamp() int64 {
@@ -256,7 +256,7 @@ type CapabilitiesResponse struct {
 func (x *CapabilitiesResponse) Reset() {
 	*x = CapabilitiesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[3]
+		mi := &file_quipsec_quipsec_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -269,7 +269,7 @@ func (x *CapabilitiesResponse) String() string {
 func (*CapabilitiesResponse) ProtoMessage() {}
 
 func (x *CapabilitiesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[3]
+	mi := &file_quipsec_quipsec_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -282,7 +282,7 @@ func (x *CapabilitiesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CapabilitiesResponse.ProtoReflect.Descriptor instead.
 func (*CapabilitiesResponse) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{3}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *CapabilitiesResponse) GetTimestamp() int64 {
@@ -311,7 +311,7 @@ type PushKeysRequest struct {
 func (x *PushKeysRequest) Reset() {
 	*x = PushKeysRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[4]
+		mi := &file_quipsec_quipsec_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -324,7 +324,7 @@ func (x *PushKeysRequest) String() string {
 func (*PushKeysRequest) ProtoMessage() {}
 
 func (x *PushKeysRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[4]
+	mi := &file_quipsec_quipsec_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -337,7 +337,7 @@ func (x *PushKeysRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PushKeysRequest.ProtoReflect.Descriptor instead.
 func (*PushKeysRequest) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{4}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *PushKeysRequest) GetTimestamp() int64 {
@@ -365,7 +365,7 @@ type PushKeysResponse struct {
 func (x *PushKeysResponse) Reset() {
 	*x = PushKeysResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[5]
+		mi := &file_quipsec_quipsec_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -378,7 +378,7 @@ func (x *PushKeysResponse) String() string {
 func (*PushKeysResponse) ProtoMessage() {}
 
 func (x *PushKeysResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[5]
+	mi := &file_quipsec_quipsec_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -391,7 +391,7 @@ func (x *PushKeysResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PushKeysResponse.ProtoReflect.Descriptor instead.
 func (*PushKeysResponse) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{5}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *PushKeysResponse) GetTimestamp() int64 {
@@ -412,7 +412,7 @@ type QkdmMetadataRequest struct {
 func (x *QkdmMetadataRequest) Reset() {
 	*x = QkdmMetadataRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[6]
+		mi := &file_quipsec_quipsec_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -425,7 +425,7 @@ func (x *QkdmMetadataRequest) String() string {
 func (*QkdmMetadataRequest) ProtoMessage() {}
 
 func (x *QkdmMetadataRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[6]
+	mi := &file_quipsec_quipsec_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -438,7 +438,7 @@ func (x *QkdmMetadataRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QkdmMetadataRequest.ProtoReflect.Descriptor instead.
 func (*QkdmMetadataRequest) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{6}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *QkdmMetadataRequest) GetTimestamp() int64 {
@@ -460,7 +460,7 @@ type QkdmMetadataResponse struct {
 func (x *QkdmMetadataResponse) Reset() {
 	*x = QkdmMetadataResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[7]
+		mi := &file_quipsec_quipsec_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -473,7 +473,7 @@ func (x *QkdmMetadataResponse) String() string {
 func (*QkdmMetadataResponse) ProtoMessage() {}
 
 func (x *QkdmMetadataResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[7]
+	mi := &file_quipsec_quipsec_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -486,7 +486,7 @@ func (x *QkdmMetadataResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QkdmMetadataResponse.ProtoReflect.Descriptor instead.
 func (*QkdmMetadataResponse) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{7}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *QkdmMetadataResponse) GetTimestamp() int64 {
@@ -514,7 +514,7 @@ type ShutdownNotificationRequest struct {
 func (x *ShutdownNotificationRequest) Reset() {
 	*x = ShutdownNotificationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[8]
+		mi := &file_quipsec_quipsec_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -527,7 +527,7 @@ func (x *ShutdownNotificationRequest) String() string {
 func (*ShutdownNotificationRequest) ProtoMessage() {}
 
 func (x *ShutdownNotificationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[8]
+	mi := &file_quipsec_quipsec_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -540,7 +540,7 @@ func (x *ShutdownNotificationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ShutdownNotificationRequest.ProtoReflect.Descriptor instead.
 func (*ShutdownNotificationRequest) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{8}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ShutdownNotificationRequest) GetShutdownReason() string {
@@ -559,7 +559,7 @@ type ShutdownNotificationResponse struct {
 func (x *ShutdownNotificationResponse) Reset() {
 	*x = ShutdownNotificationResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_quicsep_quicsep_proto_msgTypes[9]
+		mi := &file_quipsec_quipsec_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -572,7 +572,7 @@ func (x *ShutdownNotificationResponse) String() string {
 func (*ShutdownNotificationResponse) ProtoMessage() {}
 
 func (x *ShutdownNotificationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_quicsep_quicsep_proto_msgTypes[9]
+	mi := &file_quipsec_quipsec_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -585,14 +585,14 @@ func (x *ShutdownNotificationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ShutdownNotificationResponse.ProtoReflect.Descriptor instead.
 func (*ShutdownNotificationResponse) Descriptor() ([]byte, []int) {
-	return file_quicsep_quicsep_proto_rawDescGZIP(), []int{9}
+	return file_quipsec_quipsec_proto_rawDescGZIP(), []int{9}
 }
 
-var File_quicsep_quicsep_proto protoreflect.FileDescriptor
+var File_quipsec_quipsec_proto protoreflect.FileDescriptor
 
-var file_quicsep_quicsep_proto_rawDesc = []byte{
-	0x0a, 0x15, 0x71, 0x75, 0x69, 0x63, 0x73, 0x65, 0x70, 0x2f, 0x71, 0x75, 0x69, 0x63, 0x73, 0x65,
-	0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63,
+var file_quipsec_quipsec_proto_rawDesc = []byte{
+	0x0a, 0x15, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x2f, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65,
+	0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63,
 	0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x62, 0x75, 0x66, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
 	0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x22, 0xca, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a,
@@ -686,11 +686,11 @@ var file_quicsep_quicsep_proto_rawDesc = []byte{
 	0x2e, 0x76, 0x31, 0x2e, 0x53, 0x68, 0x75, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x6f, 0x74, 0x69,
 	0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x22, 0x00, 0x42, 0xa0, 0x01, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x71, 0x75, 0x69, 0x70, 0x73,
-	0x65, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x51, 0x75, 0x69, 0x63, 0x73, 0x65, 0x70, 0x50, 0x72,
+	0x65, 0x63, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x51, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x50, 0x72,
 	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e,
 	0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x64, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x71, 0x75,
-	0x69, 0x63, 0x73, 0x65, 0x70, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x71, 0x75, 0x69,
-	0x63, 0x73, 0x65, 0x70, 0x3b, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x76, 0x31, 0xa2, 0x02,
+	0x69, 0x70, 0x73, 0x65, 0x63, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x71, 0x75, 0x69,
+	0x70, 0x73, 0x65, 0x63, 0x3b, 0x71, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x76, 0x31, 0xa2, 0x02,
 	0x03, 0x51, 0x58, 0x58, 0xaa, 0x02, 0x0a, 0x51, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x2e, 0x56,
 	0x31, 0xca, 0x02, 0x0a, 0x51, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x5c, 0x56, 0x31, 0xe2, 0x02,
 	0x16, 0x51, 0x75, 0x69, 0x70, 0x73, 0x65, 0x63, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
@@ -699,19 +699,19 @@ var file_quicsep_quicsep_proto_rawDesc = []byte{
 }
 
 var (
-	file_quicsep_quicsep_proto_rawDescOnce sync.Once
-	file_quicsep_quicsep_proto_rawDescData = file_quicsep_quicsep_proto_rawDesc
+	file_quipsec_quipsec_proto_rawDescOnce sync.Once
+	file_quipsec_quipsec_proto_rawDescData = file_quipsec_quipsec_proto_rawDesc
 )
 
-func file_quicsep_quicsep_proto_rawDescGZIP() []byte {
-	file_quicsep_quicsep_proto_rawDescOnce.Do(func() {
-		file_quicsep_quicsep_proto_rawDescData = protoimpl.X.CompressGZIP(file_quicsep_quicsep_proto_rawDescData)
+func file_quipsec_quipsec_proto_rawDescGZIP() []byte {
+	file_quipsec_quipsec_proto_rawDescOnce.Do(func() {
+		file_quipsec_quipsec_proto_rawDescData = protoimpl.X.CompressGZIP(file_quipsec_quipsec_proto_rawDescData)
 	})
-	return file_quicsep_quicsep_proto_rawDescData
+	return file_quipsec_quipsec_proto_rawDescData
 }
 
-var file_quicsep_quicsep_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_quicsep_quicsep_proto_goTypes = []interface{}{
+var file_quipsec_quipsec_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_quipsec_quipsec_proto_goTypes = []interface{}{
 	(*Metadata)(nil),                     // 0: quipsec.v1.Metadata
 	(*KeyBulk)(nil),                      // 1: quipsec.v1.KeyBulk
 	(*CapabilitiesRequest)(nil),          // 2: quipsec.v1.CapabilitiesRequest
@@ -723,7 +723,7 @@ var file_quicsep_quicsep_proto_goTypes = []interface{}{
 	(*ShutdownNotificationRequest)(nil),  // 8: quipsec.v1.ShutdownNotificationRequest
 	(*ShutdownNotificationResponse)(nil), // 9: quipsec.v1.ShutdownNotificationResponse
 }
-var file_quicsep_quicsep_proto_depIdxs = []int32{
+var file_quipsec_quipsec_proto_depIdxs = []int32{
 	0, // 0: quipsec.v1.KeyBulk.metadata:type_name -> quipsec.v1.Metadata
 	1, // 1: quipsec.v1.PushKeysRequest.keyBulk:type_name -> quipsec.v1.KeyBulk
 	0, // 2: quipsec.v1.QkdmMetadataResponse.metadata:type_name -> quipsec.v1.Metadata
@@ -742,13 +742,13 @@ var file_quicsep_quicsep_proto_depIdxs = []int32{
 	0, // [0:3] is the sub-list for field type_name
 }
 
-func init() { file_quicsep_quicsep_proto_init() }
-func file_quicsep_quicsep_proto_init() {
-	if File_quicsep_quicsep_proto != nil {
+func init() { file_quipsec_quipsec_proto_init() }
+func file_quipsec_quipsec_proto_init() {
+	if File_quipsec_quipsec_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_quicsep_quicsep_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Metadata); i {
 			case 0:
 				return &v.state
@@ -760,7 +760,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*KeyBulk); i {
 			case 0:
 				return &v.state
@@ -772,7 +772,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CapabilitiesRequest); i {
 			case 0:
 				return &v.state
@@ -784,7 +784,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CapabilitiesResponse); i {
 			case 0:
 				return &v.state
@@ -796,7 +796,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PushKeysRequest); i {
 			case 0:
 				return &v.state
@@ -808,7 +808,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PushKeysResponse); i {
 			case 0:
 				return &v.state
@@ -820,7 +820,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QkdmMetadataRequest); i {
 			case 0:
 				return &v.state
@@ -832,7 +832,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QkdmMetadataResponse); i {
 			case 0:
 				return &v.state
@@ -844,7 +844,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ShutdownNotificationRequest); i {
 			case 0:
 				return &v.state
@@ -856,7 +856,7 @@ func file_quicsep_quicsep_proto_init() {
 				return nil
 			}
 		}
-		file_quicsep_quicsep_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_quipsec_quipsec_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ShutdownNotificationResponse); i {
 			case 0:
 				return &v.state
@@ -873,18 +873,18 @@ func file_quicsep_quicsep_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_quicsep_quicsep_proto_rawDesc,
+			RawDescriptor: file_quipsec_quipsec_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_quicsep_quicsep_proto_goTypes,
-		DependencyIndexes: file_quicsep_quicsep_proto_depIdxs,
-		MessageInfos:      file_quicsep_quicsep_proto_msgTypes,
+		GoTypes:           file_quipsec_quipsec_proto_goTypes,
+		DependencyIndexes: file_quipsec_quipsec_proto_depIdxs,
+		MessageInfos:      file_quipsec_quipsec_proto_msgTypes,
 	}.Build()
-	File_quicsep_quicsep_proto = out.File
-	file_quicsep_quicsep_proto_rawDesc = nil
-	file_quicsep_quicsep_proto_goTypes = nil
-	file_quicsep_quicsep_proto_depIdxs = nil
+	File_quipsec_quipsec_proto = out.File
+	file_quipsec_quipsec_proto_rawDesc = nil
+	file_quipsec_quipsec_proto_goTypes = nil
+	file_quipsec_quipsec_proto_depIdxs = nil
 }
diff --git a/gen/go/quicsep/quicsep_grpc.pb.go b/gen/go/quipsec/quipsec_grpc.pb.go
similarity index 99%
rename from gen/go/quicsep/quicsep_grpc.pb.go
rename to gen/go/quipsec/quipsec_grpc.pb.go
index b7026a99c76d03a4269f9129cbb4280a98c6c008..9d597ea2e4c1b3dfeafc4f3fbe2c058ea7bdb380 100644
--- a/gen/go/quicsep/quicsep_grpc.pb.go
+++ b/gen/go/quipsec/quipsec_grpc.pb.go
@@ -4,7 +4,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.3.0
 // - protoc             (unknown)
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 package quipsecv1
 
@@ -229,5 +229,5 @@ var KmsQkdmCommunicationService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "quicsep/quicsep.proto",
+	Metadata: "quipsec/quipsec.proto",
 }
diff --git a/gen/java/com/quipsec/v1/CapabilitiesRequest.java b/gen/java/com/quipsec/v1/CapabilitiesRequest.java
index 28bbfaf4d39dc6cbb97f45e49d642d6d4f0020d4..ef9c4812fc6c7f9ccf1ced2d831ec013aa7d6964 100644
--- a/gen/java/com/quipsec/v1/CapabilitiesRequest.java
+++ b/gen/java/com/quipsec/v1/CapabilitiesRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -29,13 +29,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesRequest_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.CapabilitiesRequest.class, com.quipsec.v1.CapabilitiesRequest.Builder.class);
   }
@@ -267,13 +267,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.CapabilitiesRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesRequest_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.CapabilitiesRequest.class, com.quipsec.v1.CapabilitiesRequest.Builder.class);
     }
@@ -300,7 +300,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesRequest_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/CapabilitiesRequestOrBuilder.java b/gen/java/com/quipsec/v1/CapabilitiesRequestOrBuilder.java
index 04f71f03f0706585738f7c51c53b54d08d851b60..e4d65e4fc979b919ee5a14fa83836370d056c515 100644
--- a/gen/java/com/quipsec/v1/CapabilitiesRequestOrBuilder.java
+++ b/gen/java/com/quipsec/v1/CapabilitiesRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/CapabilitiesResponse.java b/gen/java/com/quipsec/v1/CapabilitiesResponse.java
index c4e0dd86aebb0c2b5044ab49acb5df85a1bfceba..553dc30149184f2f6dfc2825c29c91c45bc04063 100644
--- a/gen/java/com/quipsec/v1/CapabilitiesResponse.java
+++ b/gen/java/com/quipsec/v1/CapabilitiesResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -29,13 +29,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesResponse_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.CapabilitiesResponse.class, com.quipsec.v1.CapabilitiesResponse.Builder.class);
   }
@@ -267,13 +267,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.CapabilitiesResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesResponse_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.CapabilitiesResponse.class, com.quipsec.v1.CapabilitiesResponse.Builder.class);
     }
@@ -300,7 +300,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_CapabilitiesResponse_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/CapabilitiesResponseOrBuilder.java b/gen/java/com/quipsec/v1/CapabilitiesResponseOrBuilder.java
index e7222e9353e12a05e2e04034bd34dfc814bd0124..28665e57b2573d8a5e972365cc3850d87f1a56ae 100644
--- a/gen/java/com/quipsec/v1/CapabilitiesResponseOrBuilder.java
+++ b/gen/java/com/quipsec/v1/CapabilitiesResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/KeyBulk.java b/gen/java/com/quipsec/v1/KeyBulk.java
index ad6a865e8be4694a8bde11656782d2446652267f..3b9c420ee9a771fa3268abccc793b9c9c327b659 100644
--- a/gen/java/com/quipsec/v1/KeyBulk.java
+++ b/gen/java/com/quipsec/v1/KeyBulk.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -31,13 +31,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_KeyBulk_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_KeyBulk_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_KeyBulk_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_KeyBulk_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.KeyBulk.class, com.quipsec.v1.KeyBulk.Builder.class);
   }
@@ -383,13 +383,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.KeyBulkOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_KeyBulk_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_KeyBulk_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_KeyBulk_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_KeyBulk_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.KeyBulk.class, com.quipsec.v1.KeyBulk.Builder.class);
     }
@@ -429,7 +429,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_KeyBulk_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_KeyBulk_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/KeyBulkOrBuilder.java b/gen/java/com/quipsec/v1/KeyBulkOrBuilder.java
index 2e771c6009556eaecaee356210493e8f23a9ce6c..44018811d8511d946542398567246c60c85b9ce9 100644
--- a/gen/java/com/quipsec/v1/KeyBulkOrBuilder.java
+++ b/gen/java/com/quipsec/v1/KeyBulkOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/KmsQkdmCommunicationServiceGrpc.java b/gen/java/com/quipsec/v1/KmsQkdmCommunicationServiceGrpc.java
index a384b5cf4920aed9ce9a30e5642cfab694dd1f44..069edb0c053ad895705d32a589edd449896c00f0 100644
--- a/gen/java/com/quipsec/v1/KmsQkdmCommunicationServiceGrpc.java
+++ b/gen/java/com/quipsec/v1/KmsQkdmCommunicationServiceGrpc.java
@@ -6,7 +6,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler (version 1.59.0)",
-    comments = "Source: quicsep/quicsep.proto")
+    comments = "Source: quipsec/quipsec.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class KmsQkdmCommunicationServiceGrpc {
 
@@ -515,7 +515,7 @@ public final class KmsQkdmCommunicationServiceGrpc {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return com.quipsec.v1.QuicsepProto.getDescriptor();
+      return com.quipsec.v1.QuipsecProto.getDescriptor();
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/Metadata.java b/gen/java/com/quipsec/v1/Metadata.java
index de3d201476456f68f5d1789be3cc0be4cba2c25d..d278dd45c431fb4f6d8e2458c18e2303ee7fea39 100644
--- a/gen/java/com/quipsec/v1/Metadata.java
+++ b/gen/java/com/quipsec/v1/Metadata.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -32,13 +32,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_Metadata_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_Metadata_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_Metadata_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_Metadata_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.Metadata.class, com.quipsec.v1.Metadata.Builder.class);
   }
@@ -454,13 +454,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.MetadataOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_Metadata_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_Metadata_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_Metadata_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_Metadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.Metadata.class, com.quipsec.v1.Metadata.Builder.class);
     }
@@ -491,7 +491,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_Metadata_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_Metadata_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/MetadataOrBuilder.java b/gen/java/com/quipsec/v1/MetadataOrBuilder.java
index a5b38749b80e300aed71a1b1553bd8cecab97cc7..6394fcceb6faeee5e34e9e7c90570effb6932c15 100644
--- a/gen/java/com/quipsec/v1/MetadataOrBuilder.java
+++ b/gen/java/com/quipsec/v1/MetadataOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/PushKeysRequest.java b/gen/java/com/quipsec/v1/PushKeysRequest.java
index b05c1acef3811d1178d10d4172ee8d154f144e7c..a5ca6ca185fd14b2db6e49eddaca89c5a6206ce8 100644
--- a/gen/java/com/quipsec/v1/PushKeysRequest.java
+++ b/gen/java/com/quipsec/v1/PushKeysRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -28,13 +28,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysRequest_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.PushKeysRequest.class, com.quipsec.v1.PushKeysRequest.Builder.class);
   }
@@ -260,13 +260,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.PushKeysRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysRequest_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.PushKeysRequest.class, com.quipsec.v1.PushKeysRequest.Builder.class);
     }
@@ -303,7 +303,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysRequest_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/PushKeysRequestOrBuilder.java b/gen/java/com/quipsec/v1/PushKeysRequestOrBuilder.java
index 67556de9763cf8a0f45d9936a6033acf925ac60e..4ec5d79535aa84987868e7fce37429a2ac37c86b 100644
--- a/gen/java/com/quipsec/v1/PushKeysRequestOrBuilder.java
+++ b/gen/java/com/quipsec/v1/PushKeysRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/PushKeysResponse.java b/gen/java/com/quipsec/v1/PushKeysResponse.java
index 3301795095992f4a2eac63e9200660e352f27b5a..cd0fdac9fe515a8990d95754521adf4145423728 100644
--- a/gen/java/com/quipsec/v1/PushKeysResponse.java
+++ b/gen/java/com/quipsec/v1/PushKeysResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -28,13 +28,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysResponse_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.PushKeysResponse.class, com.quipsec.v1.PushKeysResponse.Builder.class);
   }
@@ -217,13 +217,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.PushKeysResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysResponse_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.PushKeysResponse.class, com.quipsec.v1.PushKeysResponse.Builder.class);
     }
@@ -249,7 +249,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_PushKeysResponse_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/PushKeysResponseOrBuilder.java b/gen/java/com/quipsec/v1/PushKeysResponseOrBuilder.java
index 66d4a6e46f7364636d89386314cd1a62c882d0cc..67f362e89fa43bc6a91e054852f340980d725b85 100644
--- a/gen/java/com/quipsec/v1/PushKeysResponseOrBuilder.java
+++ b/gen/java/com/quipsec/v1/PushKeysResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/QkdmMetadataRequest.java b/gen/java/com/quipsec/v1/QkdmMetadataRequest.java
index f489fbd17b784201379eea344c32e0ff9d882289..70e252e5d1c98400ab20d1219d5668e0c181b8d7 100644
--- a/gen/java/com/quipsec/v1/QkdmMetadataRequest.java
+++ b/gen/java/com/quipsec/v1/QkdmMetadataRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -28,13 +28,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataRequest_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.QkdmMetadataRequest.class, com.quipsec.v1.QkdmMetadataRequest.Builder.class);
   }
@@ -217,13 +217,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.QkdmMetadataRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataRequest_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.QkdmMetadataRequest.class, com.quipsec.v1.QkdmMetadataRequest.Builder.class);
     }
@@ -249,7 +249,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataRequest_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/QkdmMetadataRequestOrBuilder.java b/gen/java/com/quipsec/v1/QkdmMetadataRequestOrBuilder.java
index a7113663093a37aaa1d3b5429d8e0fa4c376ea5f..facebb38c8e8ddfc1bfebc66865e507a765dcb5a 100644
--- a/gen/java/com/quipsec/v1/QkdmMetadataRequestOrBuilder.java
+++ b/gen/java/com/quipsec/v1/QkdmMetadataRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/QkdmMetadataResponse.java b/gen/java/com/quipsec/v1/QkdmMetadataResponse.java
index a628864cef4968a1763d7a5ea9601a710ba9ea9d..41b542ce024c4e493d761701b7bcf9fb78b8fe33 100644
--- a/gen/java/com/quipsec/v1/QkdmMetadataResponse.java
+++ b/gen/java/com/quipsec/v1/QkdmMetadataResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -28,13 +28,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataResponse_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.QkdmMetadataResponse.class, com.quipsec.v1.QkdmMetadataResponse.Builder.class);
   }
@@ -260,13 +260,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.QkdmMetadataResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataResponse_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.QkdmMetadataResponse.class, com.quipsec.v1.QkdmMetadataResponse.Builder.class);
     }
@@ -303,7 +303,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_QkdmMetadataResponse_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/QkdmMetadataResponseOrBuilder.java b/gen/java/com/quipsec/v1/QkdmMetadataResponseOrBuilder.java
index 689c218a27a74347dcb5d41b3efffb50015a8ffa..75cd08f2c85aa24287a81359dbef0098ce5def15 100644
--- a/gen/java/com/quipsec/v1/QkdmMetadataResponseOrBuilder.java
+++ b/gen/java/com/quipsec/v1/QkdmMetadataResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/QuicsepProto.java b/gen/java/com/quipsec/v1/QuipsecProto.java
similarity index 97%
rename from gen/java/com/quipsec/v1/QuicsepProto.java
rename to gen/java/com/quipsec/v1/QuipsecProto.java
index 7f4065c7953126e097a85ca1f66bbecf3e29176b..336b9f61ce47141738a256f357c3e2679eeb19b0 100644
--- a/gen/java/com/quipsec/v1/QuicsepProto.java
+++ b/gen/java/com/quipsec/v1/QuipsecProto.java
@@ -1,11 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
 
-public final class QuicsepProto {
-  private QuicsepProto() {}
+public final class QuipsecProto {
+  private QuipsecProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -74,7 +74,7 @@ public final class QuicsepProto {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025quicsep/quicsep.proto\022\nquipsec.v1\032\033buf" +
+      "\n\025quipsec/quipsec.proto\022\nquipsec.v1\032\033buf" +
       "/validate/validate.proto\"\312\001\n\010Metadata\022\034\n" +
       "\ttimestamp\030\001 \001(\003R\ttimestamp\022\026\n\006vendor\030\002 " +
       "\001(\tR\006vendor\022\030\n\007version\030\003 \001(\tR\007version\022,\n" +
@@ -112,8 +112,8 @@ public final class QuicsepProto {
       "\024ShutdownNotification\022\'.quipsec.v1.Shutd" +
       "ownNotificationRequest\032(.quipsec.v1.Shut" +
       "downNotificationResponse\"\000B\240\001\n\016com.quips" +
-      "ec.v1B\014QuicsepProtoP\001Z7code.fbi.h-da.de/" +
-      "danet/quicsep/gen/go/quicsep;quipsecv1\242\002" +
+      "ec.v1B\014QuipsecProtoP\001Z7code.fbi.h-da.de/" +
+      "danet/quipsec/gen/go/quipsec;quipsecv1\242\002" +
       "\003QXX\252\002\nQuipsec.V1\312\002\nQuipsec\\V1\342\002\026Quipsec" +
       "\\V1\\GPBMetadata\352\002\013Quipsec::V1b\006proto3"
     };
diff --git a/gen/java/com/quipsec/v1/ShutdownNotificationRequest.java b/gen/java/com/quipsec/v1/ShutdownNotificationRequest.java
index 539209f5c0052951220a63eba5c668a3880099ef..de24f1a26e392d95b0300076c74a51981dc09648 100644
--- a/gen/java/com/quipsec/v1/ShutdownNotificationRequest.java
+++ b/gen/java/com/quipsec/v1/ShutdownNotificationRequest.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -29,13 +29,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationRequest_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.ShutdownNotificationRequest.class, com.quipsec.v1.ShutdownNotificationRequest.Builder.class);
   }
@@ -244,13 +244,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.ShutdownNotificationRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationRequest_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.ShutdownNotificationRequest.class, com.quipsec.v1.ShutdownNotificationRequest.Builder.class);
     }
@@ -276,7 +276,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationRequest_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/ShutdownNotificationRequestOrBuilder.java b/gen/java/com/quipsec/v1/ShutdownNotificationRequestOrBuilder.java
index b6491bcf5233d33b3079cc2d1ad6928bfd9360e4..b2308fb3a7828063332325e61959b62708b1051e 100644
--- a/gen/java/com/quipsec/v1/ShutdownNotificationRequestOrBuilder.java
+++ b/gen/java/com/quipsec/v1/ShutdownNotificationRequestOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/java/com/quipsec/v1/ShutdownNotificationResponse.java b/gen/java/com/quipsec/v1/ShutdownNotificationResponse.java
index cec7bc483b2f62dd97a8198bccc8fce37e18a800..406cfab76e5519ee8aa36885fcbf8561bdaedcd3 100644
--- a/gen/java/com/quipsec/v1/ShutdownNotificationResponse.java
+++ b/gen/java/com/quipsec/v1/ShutdownNotificationResponse.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
@@ -28,13 +28,13 @@ private static final long serialVersionUID = 0L;
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationResponse_fieldAccessorTable
+    return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.quipsec.v1.ShutdownNotificationResponse.class, com.quipsec.v1.ShutdownNotificationResponse.Builder.class);
   }
@@ -194,13 +194,13 @@ private static final long serialVersionUID = 0L;
       com.quipsec.v1.ShutdownNotificationResponseOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationResponse_fieldAccessorTable
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.quipsec.v1.ShutdownNotificationResponse.class, com.quipsec.v1.ShutdownNotificationResponse.Builder.class);
     }
@@ -224,7 +224,7 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.quipsec.v1.QuicsepProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
+      return com.quipsec.v1.QuipsecProto.internal_static_quipsec_v1_ShutdownNotificationResponse_descriptor;
     }
 
     @java.lang.Override
diff --git a/gen/java/com/quipsec/v1/ShutdownNotificationResponseOrBuilder.java b/gen/java/com/quipsec/v1/ShutdownNotificationResponseOrBuilder.java
index c08536cde7b511f28924f5667612a4f045530c19..3c137f3dd9667bc7264a3ac9ea1874d05764f427 100644
--- a/gen/java/com/quipsec/v1/ShutdownNotificationResponseOrBuilder.java
+++ b/gen/java/com/quipsec/v1/ShutdownNotificationResponseOrBuilder.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: quicsep/quicsep.proto
+// source: quipsec/quipsec.proto
 
 // Protobuf Java Version: 3.25.0
 package com.quipsec.v1;
diff --git a/gen/python/quicsep/quicsep_pb2.py b/gen/python/quipsec/quipsec_pb2.py
similarity index 94%
rename from gen/python/quicsep/quicsep_pb2.py
rename to gen/python/quipsec/quipsec_pb2.py
index c6acca5b06fe7af639bb51a4aa59610e822b7da5..2b75bad3bf83b3a07b228fe00b3fe41167327de1 100644
--- a/gen/python/quicsep/quicsep_pb2.py
+++ b/gen/python/quipsec/quipsec_pb2.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: quicsep/quicsep.proto
+# source: quipsec/quipsec.proto
 # Protobuf Python Version: 4.25.0
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
@@ -15,14 +15,14 @@ _sym_db = _symbol_database.Default()
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15quicsep/quicsep.proto\x12\nquipsec.v1\x1a\x1b\x62uf/validate/validate.proto\"\xca\x01\n\x08Metadata\x12\x1c\n\ttimestamp\x18\x01 \x01(\x03R\ttimestamp\x12\x16\n\x06vendor\x18\x02 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x03 \x01(\tR\x07version\x12,\n\x11keyGenerationRate\x18\x04 \x01(\x04R\x11keyGenerationRate\x12\x1a\n\x08sourceId\x18\x05 \x01(\tR\x08sourceId\x12$\n\rdestinationId\x18\x06 \x01(\tR\rdestinationId\"\xc5\x01\n\x07KeyBulk\x12\x1c\n\x05keyId\x18\x01 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x05keyId\x12\x1a\n\x04keys\x18\x02 \x01(\x0c\x42\x06\xbaH\x03\xc8\x01\x01R\x04keys\x12$\n\tkeyLength\x18\x03 \x01(\x04\x42\x06\xbaH\x03\xc8\x01\x01R\tkeyLength\x12 \n\x07keyHash\x18\x04 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07keyHash\x12\x38\n\x08metadata\x18\x05 \x01(\x0b\x32\x14.quipsec.v1.MetadataB\x06\xbaH\x03\xc8\x01\x01R\x08metadata\"]\n\x13\x43\x61pabilitiesRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12 \n\x07version\x18\x02 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07version\"^\n\x14\x43\x61pabilitiesResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12 \n\x07version\x18\x02 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07version\"n\n\x0fPushKeysRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12\x35\n\x07keyBulk\x18\x02 \x01(\x0b\x32\x13.quipsec.v1.KeyBulkB\x06\xbaH\x03\xc8\x01\x01R\x07keyBulk\"8\n\x10PushKeysResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\";\n\x13QkdmMetadataRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\"v\n\x14QkdmMetadataResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12\x38\n\x08metadata\x18\x02 \x01(\x0b\x32\x14.quipsec.v1.MetadataB\x06\xbaH\x03\xc8\x01\x01R\x08metadata\"M\n\x1bShutdownNotificationRequest\x12.\n\x0eshutdownReason\x18\x01 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x0eshutdownReason\"\x1e\n\x1cShutdownNotificationResponse2\xfd\x02\n\x1bKmsQkdmCommunicationService\x12S\n\x0c\x43\x61pabilities\x12\x1f.quipsec.v1.CapabilitiesRequest\x1a .quipsec.v1.CapabilitiesResponse\"\x00\x12G\n\x08PushKeys\x12\x1b.quipsec.v1.PushKeysRequest\x1a\x1c.quipsec.v1.PushKeysResponse\"\x00\x12S\n\x0cQkdmMetadata\x12\x1f.quipsec.v1.QkdmMetadataRequest\x1a .quipsec.v1.QkdmMetadataResponse\"\x00\x12k\n\x14ShutdownNotification\x12\'.quipsec.v1.ShutdownNotificationRequest\x1a(.quipsec.v1.ShutdownNotificationResponse\"\x00\x42\xa0\x01\n\x0e\x63om.quipsec.v1B\x0cQuicsepProtoP\x01Z7code.fbi.h-da.de/danet/quicsep/gen/go/quicsep;quipsecv1\xa2\x02\x03QXX\xaa\x02\nQuipsec.V1\xca\x02\nQuipsec\\V1\xe2\x02\x16Quipsec\\V1\\GPBMetadata\xea\x02\x0bQuipsec::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15quipsec/quipsec.proto\x12\nquipsec.v1\x1a\x1b\x62uf/validate/validate.proto\"\xca\x01\n\x08Metadata\x12\x1c\n\ttimestamp\x18\x01 \x01(\x03R\ttimestamp\x12\x16\n\x06vendor\x18\x02 \x01(\tR\x06vendor\x12\x18\n\x07version\x18\x03 \x01(\tR\x07version\x12,\n\x11keyGenerationRate\x18\x04 \x01(\x04R\x11keyGenerationRate\x12\x1a\n\x08sourceId\x18\x05 \x01(\tR\x08sourceId\x12$\n\rdestinationId\x18\x06 \x01(\tR\rdestinationId\"\xc5\x01\n\x07KeyBulk\x12\x1c\n\x05keyId\x18\x01 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x05keyId\x12\x1a\n\x04keys\x18\x02 \x01(\x0c\x42\x06\xbaH\x03\xc8\x01\x01R\x04keys\x12$\n\tkeyLength\x18\x03 \x01(\x04\x42\x06\xbaH\x03\xc8\x01\x01R\tkeyLength\x12 \n\x07keyHash\x18\x04 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07keyHash\x12\x38\n\x08metadata\x18\x05 \x01(\x0b\x32\x14.quipsec.v1.MetadataB\x06\xbaH\x03\xc8\x01\x01R\x08metadata\"]\n\x13\x43\x61pabilitiesRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12 \n\x07version\x18\x02 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07version\"^\n\x14\x43\x61pabilitiesResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12 \n\x07version\x18\x02 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x07version\"n\n\x0fPushKeysRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12\x35\n\x07keyBulk\x18\x02 \x01(\x0b\x32\x13.quipsec.v1.KeyBulkB\x06\xbaH\x03\xc8\x01\x01R\x07keyBulk\"8\n\x10PushKeysResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\";\n\x13QkdmMetadataRequest\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\"v\n\x14QkdmMetadataResponse\x12$\n\ttimestamp\x18\x01 \x01(\x03\x42\x06\xbaH\x03\xc8\x01\x01R\ttimestamp\x12\x38\n\x08metadata\x18\x02 \x01(\x0b\x32\x14.quipsec.v1.MetadataB\x06\xbaH\x03\xc8\x01\x01R\x08metadata\"M\n\x1bShutdownNotificationRequest\x12.\n\x0eshutdownReason\x18\x01 \x01(\tB\x06\xbaH\x03\xc8\x01\x01R\x0eshutdownReason\"\x1e\n\x1cShutdownNotificationResponse2\xfd\x02\n\x1bKmsQkdmCommunicationService\x12S\n\x0c\x43\x61pabilities\x12\x1f.quipsec.v1.CapabilitiesRequest\x1a .quipsec.v1.CapabilitiesResponse\"\x00\x12G\n\x08PushKeys\x12\x1b.quipsec.v1.PushKeysRequest\x1a\x1c.quipsec.v1.PushKeysResponse\"\x00\x12S\n\x0cQkdmMetadata\x12\x1f.quipsec.v1.QkdmMetadataRequest\x1a .quipsec.v1.QkdmMetadataResponse\"\x00\x12k\n\x14ShutdownNotification\x12\'.quipsec.v1.ShutdownNotificationRequest\x1a(.quipsec.v1.ShutdownNotificationResponse\"\x00\x42\xa0\x01\n\x0e\x63om.quipsec.v1B\x0cQuipsecProtoP\x01Z7code.fbi.h-da.de/danet/quipsec/gen/go/quipsec;quipsecv1\xa2\x02\x03QXX\xaa\x02\nQuipsec.V1\xca\x02\nQuipsec\\V1\xe2\x02\x16Quipsec\\V1\\GPBMetadata\xea\x02\x0bQuipsec::V1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'quicsep.quicsep_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'quipsec.quipsec_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
-  _globals['DESCRIPTOR']._serialized_options = b'\n\016com.quipsec.v1B\014QuicsepProtoP\001Z7code.fbi.h-da.de/danet/quicsep/gen/go/quicsep;quipsecv1\242\002\003QXX\252\002\nQuipsec.V1\312\002\nQuipsec\\V1\342\002\026Quipsec\\V1\\GPBMetadata\352\002\013Quipsec::V1'
+  _globals['DESCRIPTOR']._serialized_options = b'\n\016com.quipsec.v1B\014QuipsecProtoP\001Z7code.fbi.h-da.de/danet/quipsec/gen/go/quipsec;quipsecv1\242\002\003QXX\252\002\nQuipsec.V1\312\002\nQuipsec\\V1\342\002\026Quipsec\\V1\\GPBMetadata\352\002\013Quipsec::V1'
   _globals['_KEYBULK'].fields_by_name['keyId']._options = None
   _globals['_KEYBULK'].fields_by_name['keyId']._serialized_options = b'\272H\003\310\001\001'
   _globals['_KEYBULK'].fields_by_name['keys']._options = None
diff --git a/gen/python/quicsep/quicsep_pb2_grpc.py b/gen/python/quipsec/quipsec_pb2_grpc.py
similarity index 79%
rename from gen/python/quicsep/quicsep_pb2_grpc.py
rename to gen/python/quipsec/quipsec_pb2_grpc.py
index 02966f3bd6de48a590fdccf255e4b5e459fecf8f..9c00ac9ff40e4479a926821b33a2e823ad01c20f 100644
--- a/gen/python/quicsep/quicsep_pb2_grpc.py
+++ b/gen/python/quipsec/quipsec_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from quicsep import quicsep_pb2 as quicsep_dot_quicsep__pb2
+from quipsec import quipsec_pb2 as quipsec_dot_quipsec__pb2
 
 
 class KmsQkdmCommunicationServiceStub(object):
@@ -16,23 +16,23 @@ class KmsQkdmCommunicationServiceStub(object):
         """
         self.Capabilities = channel.unary_unary(
                 '/quipsec.v1.KmsQkdmCommunicationService/Capabilities',
-                request_serializer=quicsep_dot_quicsep__pb2.CapabilitiesRequest.SerializeToString,
-                response_deserializer=quicsep_dot_quicsep__pb2.CapabilitiesResponse.FromString,
+                request_serializer=quipsec_dot_quipsec__pb2.CapabilitiesRequest.SerializeToString,
+                response_deserializer=quipsec_dot_quipsec__pb2.CapabilitiesResponse.FromString,
                 )
         self.PushKeys = channel.unary_unary(
                 '/quipsec.v1.KmsQkdmCommunicationService/PushKeys',
-                request_serializer=quicsep_dot_quicsep__pb2.PushKeysRequest.SerializeToString,
-                response_deserializer=quicsep_dot_quicsep__pb2.PushKeysResponse.FromString,
+                request_serializer=quipsec_dot_quipsec__pb2.PushKeysRequest.SerializeToString,
+                response_deserializer=quipsec_dot_quipsec__pb2.PushKeysResponse.FromString,
                 )
         self.QkdmMetadata = channel.unary_unary(
                 '/quipsec.v1.KmsQkdmCommunicationService/QkdmMetadata',
-                request_serializer=quicsep_dot_quicsep__pb2.QkdmMetadataRequest.SerializeToString,
-                response_deserializer=quicsep_dot_quicsep__pb2.QkdmMetadataResponse.FromString,
+                request_serializer=quipsec_dot_quipsec__pb2.QkdmMetadataRequest.SerializeToString,
+                response_deserializer=quipsec_dot_quipsec__pb2.QkdmMetadataResponse.FromString,
                 )
         self.ShutdownNotification = channel.unary_unary(
                 '/quipsec.v1.KmsQkdmCommunicationService/ShutdownNotification',
-                request_serializer=quicsep_dot_quicsep__pb2.ShutdownNotificationRequest.SerializeToString,
-                response_deserializer=quicsep_dot_quicsep__pb2.ShutdownNotificationResponse.FromString,
+                request_serializer=quipsec_dot_quipsec__pb2.ShutdownNotificationRequest.SerializeToString,
+                response_deserializer=quipsec_dot_quipsec__pb2.ShutdownNotificationResponse.FromString,
                 )
 
 
@@ -73,23 +73,23 @@ def add_KmsQkdmCommunicationServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'Capabilities': grpc.unary_unary_rpc_method_handler(
                     servicer.Capabilities,
-                    request_deserializer=quicsep_dot_quicsep__pb2.CapabilitiesRequest.FromString,
-                    response_serializer=quicsep_dot_quicsep__pb2.CapabilitiesResponse.SerializeToString,
+                    request_deserializer=quipsec_dot_quipsec__pb2.CapabilitiesRequest.FromString,
+                    response_serializer=quipsec_dot_quipsec__pb2.CapabilitiesResponse.SerializeToString,
             ),
             'PushKeys': grpc.unary_unary_rpc_method_handler(
                     servicer.PushKeys,
-                    request_deserializer=quicsep_dot_quicsep__pb2.PushKeysRequest.FromString,
-                    response_serializer=quicsep_dot_quicsep__pb2.PushKeysResponse.SerializeToString,
+                    request_deserializer=quipsec_dot_quipsec__pb2.PushKeysRequest.FromString,
+                    response_serializer=quipsec_dot_quipsec__pb2.PushKeysResponse.SerializeToString,
             ),
             'QkdmMetadata': grpc.unary_unary_rpc_method_handler(
                     servicer.QkdmMetadata,
-                    request_deserializer=quicsep_dot_quicsep__pb2.QkdmMetadataRequest.FromString,
-                    response_serializer=quicsep_dot_quicsep__pb2.QkdmMetadataResponse.SerializeToString,
+                    request_deserializer=quipsec_dot_quipsec__pb2.QkdmMetadataRequest.FromString,
+                    response_serializer=quipsec_dot_quipsec__pb2.QkdmMetadataResponse.SerializeToString,
             ),
             'ShutdownNotification': grpc.unary_unary_rpc_method_handler(
                     servicer.ShutdownNotification,
-                    request_deserializer=quicsep_dot_quicsep__pb2.ShutdownNotificationRequest.FromString,
-                    response_serializer=quicsep_dot_quicsep__pb2.ShutdownNotificationResponse.SerializeToString,
+                    request_deserializer=quipsec_dot_quipsec__pb2.ShutdownNotificationRequest.FromString,
+                    response_serializer=quipsec_dot_quipsec__pb2.ShutdownNotificationResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -113,8 +113,8 @@ class KmsQkdmCommunicationService(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/quipsec.v1.KmsQkdmCommunicationService/Capabilities',
-            quicsep_dot_quicsep__pb2.CapabilitiesRequest.SerializeToString,
-            quicsep_dot_quicsep__pb2.CapabilitiesResponse.FromString,
+            quipsec_dot_quipsec__pb2.CapabilitiesRequest.SerializeToString,
+            quipsec_dot_quipsec__pb2.CapabilitiesResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -130,8 +130,8 @@ class KmsQkdmCommunicationService(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/quipsec.v1.KmsQkdmCommunicationService/PushKeys',
-            quicsep_dot_quicsep__pb2.PushKeysRequest.SerializeToString,
-            quicsep_dot_quicsep__pb2.PushKeysResponse.FromString,
+            quipsec_dot_quipsec__pb2.PushKeysRequest.SerializeToString,
+            quipsec_dot_quipsec__pb2.PushKeysResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -147,8 +147,8 @@ class KmsQkdmCommunicationService(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/quipsec.v1.KmsQkdmCommunicationService/QkdmMetadata',
-            quicsep_dot_quicsep__pb2.QkdmMetadataRequest.SerializeToString,
-            quicsep_dot_quicsep__pb2.QkdmMetadataResponse.FromString,
+            quipsec_dot_quipsec__pb2.QkdmMetadataRequest.SerializeToString,
+            quipsec_dot_quipsec__pb2.QkdmMetadataResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -164,7 +164,7 @@ class KmsQkdmCommunicationService(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/quipsec.v1.KmsQkdmCommunicationService/ShutdownNotification',
-            quicsep_dot_quicsep__pb2.ShutdownNotificationRequest.SerializeToString,
-            quicsep_dot_quicsep__pb2.ShutdownNotificationResponse.FromString,
+            quipsec_dot_quipsec__pb2.ShutdownNotificationRequest.SerializeToString,
+            quipsec_dot_quipsec__pb2.ShutdownNotificationResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/proto/quicsep/quicsep.proto b/proto/quipsec/quipsec.proto
similarity index 100%
rename from proto/quicsep/quicsep.proto
rename to proto/quipsec/quipsec.proto