diff --git a/src/main/proto/epp.proto b/src/main/proto/epp.proto
index 907ffab6..6cd24fc8 100644
--- a/src/main/proto/epp.proto
+++ b/src/main/proto/epp.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.epp";
 option java_outer_classname = "EPPProto";
 
+package gov.nist.csd.pm.proto.epp;
+
 message StringList {
   repeated string values = 1;
 }
diff --git a/src/main/proto/graph.proto b/src/main/proto/graph.proto
index 140889ea..b68786ef 100644
--- a/src/main/proto/graph.proto
+++ b/src/main/proto/graph.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.graph";
 option java_outer_classname = "GraphProto";
 
+package gov.nist.csd.pm.proto.graph;
+
 message AssignOp {
   string ascendant = 1;
   repeated string descendants = 2;
diff --git a/src/main/proto/obligation.proto b/src/main/proto/obligation.proto
index 2953cb43..8736709b 100644
--- a/src/main/proto/obligation.proto
+++ b/src/main/proto/obligation.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.obligation";
 option java_outer_classname = "ObligationProto";
 
+package gov.nist.csd.pm.proto.obligation;
+
 message CreateObligationOp {
   string name = 1;
   string author = 2;
diff --git a/src/main/proto/operation.proto b/src/main/proto/operation.proto
index ac460548..dc75030c 100644
--- a/src/main/proto/operation.proto
+++ b/src/main/proto/operation.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.operation";
 option java_outer_classname = "OperationProto";
 
+package gov.nist.csd.pm.proto.operation;
+
 message CreateAdminOperationOp {
   string pml = 1;
 }
diff --git a/src/main/proto/pdp.proto b/src/main/proto/pdp.proto
index b051052f..2056809c 100644
--- a/src/main/proto/pdp.proto
+++ b/src/main/proto/pdp.proto
@@ -7,6 +7,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.pdp";
 option java_outer_classname = "PDPProto";
 
+package gov.nist.csd.pm.proto.pdp;
+
 enum Decision {
   GRANT = 0;
   DENY = 1;
@@ -31,7 +33,7 @@ service ResourcePDP {
 // admin
 message AdminOperationRequest {
   string opName = 1;
-  repeated OperandEntry operands = 2;
+  repeated gov.nist.csd.pm.proto.epp.OperandEntry operands = 2;
 }
 
 message AdminRoutineRequest {
@@ -40,7 +42,7 @@ message AdminRoutineRequest {
 
 message NamedAdminRoutineRequest {
   string name = 1;
-  repeated OperandEntry operands = 2;
+  repeated gov.nist.csd.pm.proto.epp.OperandEntry operands = 2;
 }
 
 service AdminPDP {
diff --git a/src/main/proto/prohibitions.proto b/src/main/proto/prohibitions.proto
index 51fb8829..1e9a4700 100644
--- a/src/main/proto/prohibitions.proto
+++ b/src/main/proto/prohibitions.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.prohibition";
 option java_outer_classname = "ProhibitionProto";
 
+package gov.nist.csd.pm.proto.prohibitions;
+
 message CreateProhibitionOp {
   string name = 1;
   string subject = 2;
diff --git a/src/main/proto/routine.proto b/src/main/proto/routine.proto
index 3814b459..2fa6b5c7 100644
--- a/src/main/proto/routine.proto
+++ b/src/main/proto/routine.proto
@@ -4,6 +4,8 @@ option java_multiple_files = true;
 option java_package = "gov.nist.csd.pm.proto.routine";
 option java_outer_classname = "RoutineProto";
 
+package gov.nist.csd.pm.proto.routine;
+
 message CreateAdminRoutineOp {
   string pml = 1;
 }