diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
index 5c0b00d65e..13aa4aef1a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.documents.Document;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.database.model.DatabaseProtos.ReactionList;
+import org.thoughtcrime.securesms.database.model.databaseprotos.ReactionList;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.insights.InsightsConstants;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/app/src/main/proto/Database.proto b/app/src/main/proto/Database.proto
index c50a258216..83fa88aeec 100644
--- a/app/src/main/proto/Database.proto
+++ b/app/src/main/proto/Database.proto
@@ -8,8 +8,8 @@ syntax = "proto3";
 
 package signal;
 
-option java_package         = "org.thoughtcrime.securesms.database.model";
-option java_outer_classname = "DatabaseProtos";
+option java_package        = "org.thoughtcrime.securesms.database.model.databaseprotos";
+option java_multiple_files = true;
 
 
 message ReactionList {