diff --git a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
index ea3a7cb..50c8035 100644
--- a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
+++ b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
@@ -32,7 +32,8 @@
 import com.google.polo.pairing.message.SecretAckMessage;
 import com.google.polo.pairing.message.SecretMessage;
 import com.google.polo.wire.PoloWireInterface;
-import com.google.polo.wire.protobuf.PoloProto.OuterMessage;
+import com.google.polo.wire.protobuf.nano.PoloProto;
+import com.google.polo.wire.protobuf.nano.PoloProto.OuterMessage;
 import com.google.protobuf.nano.MessageNano;
 
 import java.io.IOException;
diff --git a/proto/polo.proto b/proto/polo.proto
index 0491439..3d8ef75 100644
--- a/proto/polo.proto
+++ b/proto/polo.proto
@@ -2,7 +2,9 @@
 
 package polo.wire.protobuf;
 
-option javanano_use_deprecated_package = true;
+//removing deprecated option.
+//refer go/namespacing-nano for additional details.
+//option javanano_use_deprecated_package = true;
 option java_outer_classname = "PoloProto";
 option java_package = "com.google.polo.wire.protobuf";
 option optimize_for = LITE_RUNTIME;