diff --git a/internal/proto/credential.proto b/internal/proto/credential.proto
index a4b33302..de72b96c 100644
--- a/internal/proto/credential.proto
+++ b/internal/proto/credential.proto
@@ -18,7 +18,9 @@ package nearby.internal;
 
 // option cc_api_version = 2;
 // option java_api_version = 2;
+option java_multiple_files = true;
 option java_package = "com.google.nearby.presence";
+option java_outer_classname = "CredentialProto";
 
 enum IdentityType {
   IDENTITY_TYPE_UNSPECIFIED = 0;
diff --git a/internal/proto/local_credential.proto b/internal/proto/local_credential.proto
index 2ee3d0f7..1a1475f5 100644
--- a/internal/proto/local_credential.proto
+++ b/internal/proto/local_credential.proto
@@ -20,7 +20,9 @@ import "internal/proto/credential.proto";
 
 // option cc_api_version = 2;
 // option java_api_version = 2;
+option java_multiple_files = true;
 option java_package = "com.google.nearby.presence";
+option java_outer_classname = "LocalCredentialProto";
 
 // The local credential contains information of a local device for
 // identity encryption and authentication. It should never leave the generating
diff --git a/internal/proto/metadata.proto b/internal/proto/metadata.proto
index 3014cf33..8edb1d33 100644
--- a/internal/proto/metadata.proto
+++ b/internal/proto/metadata.proto
@@ -16,6 +16,11 @@ syntax = "proto3";
 
 package nearby.internal;
 
+// option java_api_version = 2;
+option java_multiple_files = true;
+option java_package = "com.google.nearby.presence";
+option java_outer_classname = "MetadataProto";
+
 // The metadata of a device.
 // Contains confidential data not to be broadcasted directly in OTA.
 message Metadata {