diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
index 5d0b718..cad250a 100644
--- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
+++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
@@ -157,7 +157,7 @@
             if (configuration.getPlaniHeader() != null) {
                 request.setHeader(
                         sHeaderFactory.createHeader(PLANI_HEADER_NAME,
-                                configuration.getPaniHeader()));
+                                configuration.getPlaniHeader()));
             }
         } catch (InvalidArgumentException e) {
             // Nothing to do here
@@ -295,7 +295,7 @@
         }
         if (configuration.getPlaniHeader() != null) {
             response.setHeader(
-                    sHeaderFactory.createHeader(PLANI_HEADER_NAME, configuration.getPaniHeader()));
+                    sHeaderFactory.createHeader(PLANI_HEADER_NAME, configuration.getPlaniHeader()));
         }
         return response;
     }
