1 files changed, 7 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc
index 7f35d712..db72ea1a 100644
--- a/src/google/protobuf/compiler/php/php_generator.cc
+++ b/src/google/protobuf/compiler/php/php_generator.cc
@@ -90,7 +90,7 @@ std::string MessagePrefix(const Descriptor* message) {
       message->file()->package() == "google.protobuf") {
     return "GPB";
   } else {
-    return "";
+    return (message->file()->options()).php_class_prefix();
   }
 }
 
@@ -103,8 +103,12 @@ std::string MessageName(const Descriptor* message, bool is_descriptor) {
   }
   message_name = MessagePrefix(message) + message_name;
 
-  return PhpName(message->file()->package(), is_descriptor) + '\\' +
-         message_name;
+  if (message->file()->package() == "") {
+    return message_name;
+  } else {
+    return PhpName(message->file()->package(), is_descriptor) + '\\' +
+           message_name;
+  }
 }
 
 std::string MessageFullName(const Descriptor* message, bool is_descriptor) {