diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index 08ca2f0..bb316e2 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -69,16 +69,16 @@
     }
 
     @Override
-    public void onSetAudioState(AudioState state) {
-        if (VERBOSE) log("onSetAudioState: " + state);
+    public void onAudioStateChanged(AudioState state) {
+        if (VERBOSE) log("onAudioStateChanged: " + state);
         if (getPhone() != null) {
             getPhone().setEchoSuppressionEnabled();
         }
     }
 
     @Override
-    public void onSetState(int state) {
-        if (VERBOSE) log("onSetState, state: " + Connection.stateToString(state));
+    public void onStateChanged(int state) {
+        if (VERBOSE) log("onStateChanged, state: " + Connection.stateToString(state));
     }
 
     @Override
@@ -183,11 +183,6 @@
         // SIP doesn't have post dial support.
     }
 
-    @Override
-    public void onPhoneAccountClicked() {
-        if (VERBOSE) log("onPhoneAccountClicked");
-    }
-
     private Call getCall() {
         if (mOriginalConnection != null) {
             return mOriginalConnection.getCall();
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index 12ccbce..401f4dc 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -115,11 +115,11 @@
     }
 
     @Override
-    public void onSetState(int state) {
+    public void onStateChanged(int state) {
         Connection originalConnection = getOriginalConnection();
         mIsCallWaiting = originalConnection != null &&
                 originalConnection.getState() == Call.State.WAITING;
-        super.onSetState(state);
+        super.onStateChanged(state);
     }
 
     @Override
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 60e5d17..31b6f01 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -174,7 +174,7 @@
     }
 
     @Override
-    public void onSetAudioState(AudioState audioState) {
+    public void onAudioStateChanged(AudioState audioState) {
         // TODO: update TTY mode.
         if (getPhone() != null) {
             getPhone().setEchoSuppressionEnabled();
@@ -182,8 +182,8 @@
     }
 
     @Override
-    public void onSetState(int state) {
-        Log.v(this, "onSetState, state: " + Connection.stateToString(state));
+    public void onStateChanged(int state) {
+        Log.v(this, "onStateChanged, state: " + Connection.stateToString(state));
     }
 
     @Override
@@ -253,11 +253,6 @@
         }
     }
 
-    @Override
-    public void onPhoneAccountClicked() {
-        Log.v(this, "onPhoneAccountClicked");
-    }
-
     public void performHold() {
         Log.v(this, "performHold");
         // TODO: Can dialing calls be put on hold as well since they take up the