diff --git a/client/android/Notifier/app/src/main/java/com/mobilesec/client/notifier/NotificationBroadcastReceiver.java b/client/android/Notifier/app/src/main/java/com/mobilesec/client/notifier/NotificationBroadcastReceiver.java
index 1e51da71ed3298a22cef7020716f3e21daa57f54..969916cee73a5f7b09980061b9bcf9f931d8ce79 100644
--- a/client/android/Notifier/app/src/main/java/com/mobilesec/client/notifier/NotificationBroadcastReceiver.java
+++ b/client/android/Notifier/app/src/main/java/com/mobilesec/client/notifier/NotificationBroadcastReceiver.java
@@ -7,27 +7,28 @@ import android.util.Log;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.notifier.Message;
 import io.grpc.notifier.Nothing;
-import io.grpc.notifier.NotifierComGrpc;
-import io.grpc.notifier.SendMessageRequest;
+import io.grpc.notifier.NotifierCommunicationGrpc;
 import io.grpc.stub.StreamObserver;
 
 public class NotificationBroadcastReceiver extends BroadcastReceiver {
 
     private ManagedChannel channel;
-    private final NotifierComGrpc.NotifierComStub asyncStub;
+    private final NotifierCommunicationGrpc.NotifierCommunicationStub asyncStub;
 
     public NotificationBroadcastReceiver() {
         channel = ManagedChannelBuilder.forAddress("192.168.0.127", 8080).usePlaintext().build();
         Log.i("NOTIFIER[NotificationBroadcastReceiver]", String.format("ConnectivityState: %s", channel.getState(true).name()));
-        asyncStub = NotifierComGrpc.newStub(channel);
+        asyncStub = NotifierCommunicationGrpc.newStub(channel);
     }
 
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.i("NOTIFIER[onReceive]", "Received notification.");
         Notification notification = (Notification) intent.getSerializableExtra("Notification");
-        SendMessageRequest message = SendMessageRequest.newBuilder().setMessage(notification.toString()).build();
+        Message message = Message.newBuilder().setCommId(1).setContent(notification.toString()).build();
+
         asyncStub.sendMessage(message, new StreamObserver<Nothing>() {
             @Override
             public void onNext(Nothing value) {
@@ -46,5 +47,6 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver {
                 Log.i("NOTIFIER[onReceive]", "Completed sendMessage.");
             }
         });
+
     }
 }
diff --git a/server/server.py b/server/server.py
index f95e0fd0f512494943ad5897fc566fa37b55e762..9182d96ac50375eceae81edeee8e2107cd5f13f7 100644
--- a/server/server.py
+++ b/server/server.py
@@ -23,11 +23,10 @@ class NotifierService(NotifierCommunicationServicer):
         # TODO: read comm_id and wait for messages
         yield Message(comm_id=-1, content="test")
 
-    def SendMessage(self, request_iterator, context):
-        for msg in request_iterator:
-            # TODO: read comm_id and route message
-            print(msg.comm_id)
-            print(msg.content)
+    def SendMessage(self, request, context):
+        # TODO: read comm_id and route message
+        print(request.comm_id)
+        print(request.content)
         return Nothing()
 
 
diff --git a/shared/netcode.proto b/shared/netcode.proto
index fd30b6bfcbaff1ea4585d1344d9f0212315af626..83030ca6794ddbfec5b170a73db505683185a8c5 100644
--- a/shared/netcode.proto
+++ b/shared/netcode.proto
@@ -10,7 +10,7 @@ package netcode;
 service NotifierCommunication {
   rpc Open (OpenRequest) returns (CommResponse);
   rpc Answer (AnswerRequest) returns (CommResponse);
-  rpc SendMessage (stream Message) returns (Nothing);
+  rpc SendMessage (Message) returns (Nothing);
   rpc ReceiveMessage (ReceiveRequest) returns (stream Message);
 }