diff --git a/radio/aidl/vts/radio_ims_indication.cpp b/radio/aidl/vts/radio_ims_indication.cpp
index 6f6d4f2..9c821ff 100644
--- a/radio/aidl/vts/radio_ims_indication.cpp
+++ b/radio/aidl/vts/radio_ims_indication.cpp
@@ -19,12 +19,7 @@
 RadioImsIndication::RadioImsIndication(RadioServiceTest& parent) : parent_ims(parent) {}
 
 ndk::ScopedAStatus RadioImsIndication::onConnectionSetupFailure(RadioIndicationType /*type*/,
-        int /*token*/, const ConnectionFailureInfo& /*info*/) {
-    return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus RadioImsIndication::onAccessAllowed(RadioIndicationType /*type*/,
-        int /*token*/) {
+        const std::string& /*token*/, const ConnectionFailureInfo& /*info*/) {
     return ndk::ScopedAStatus::ok();
 }
 
diff --git a/radio/aidl/vts/radio_ims_response.cpp b/radio/aidl/vts/radio_ims_response.cpp
index dd629a5..fa34dc1 100644
--- a/radio/aidl/vts/radio_ims_response.cpp
+++ b/radio/aidl/vts/radio_ims_response.cpp
@@ -31,13 +31,15 @@
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus RadioImsResponse::notifyImsTrafficResponse(const RadioResponseInfo& info) {
+ndk::ScopedAStatus RadioImsResponse::startImsTrafficResponse(const RadioResponseInfo& info,
+        const std::optional<ConnectionFailureInfo>& response) {
     rspInfo = info;
+    startImsTrafficResp = response;
     parent_ims.notify(info.serial);
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus RadioImsResponse::performAcbCheckResponse(const RadioResponseInfo& info) {
+ndk::ScopedAStatus RadioImsResponse::stopImsTrafficResponse(const RadioResponseInfo& info) {
     rspInfo = info;
     parent_ims.notify(info.serial);
     return ndk::ScopedAStatus::ok();
@@ -53,4 +55,4 @@
     rspInfo = info;
     parent_ims.notify(info.serial);
     return ndk::ScopedAStatus::ok();
-}
\ No newline at end of file
+}
diff --git a/radio/aidl/vts/radio_ims_test.cpp b/radio/aidl/vts/radio_ims_test.cpp
index 52c5f02..84b7c6a 100644
--- a/radio/aidl/vts/radio_ims_test.cpp
+++ b/radio/aidl/vts/radio_ims_test.cpp
@@ -92,10 +92,10 @@
     serial = GetRandomSerialNumber();
 
     ImsRegistration regInfo;
-    regInfo.state = ImsRegistration::State::NOT_REGISTERED;
-    regInfo.ipcan = ImsRegistration::ImsAccessNetwork::NONE;
-    regInfo.reason = ImsRegistration::FailureReason::NONE;
-    regInfo.features = ImsRegistration::FEATURE_NONE;
+    regInfo.regState = ImsRegistrationState::NOT_REGISTERED;
+    regInfo.accessNetworkType = AccessNetwork::EUTRAN;
+    regInfo.reason = ImsFailureReason::NONE;
+    regInfo.capabilities = ImsRegistration::IMS_MMTEL_CAPABILITY_NONE;
 
     ndk::ScopedAStatus res =
             radio_ims->updateImsRegistrationInfo(serial, regInfo);
@@ -111,52 +111,53 @@
 }
 
 /*
- * Test IRadioIms.notifyImsTraffic() for the response returned.
+ * Test IRadioIms.startImsTraffic() for the response returned.
  */
-TEST_P(RadioImsTest, notifyImsTraffic) {
+TEST_P(RadioImsTest, startImsTraffic) {
     if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
-        ALOGI("Skipping notifyImsTraffic because ims is not supported in device");
+        ALOGI("Skipping startImsTraffic because ims is not supported in device");
         return;
     } else {
-        ALOGI("Running notifyImsTraffic because ims is supported in device");
+        ALOGI("Running startImsTraffic because ims is supported in device");
     }
 
     serial = GetRandomSerialNumber();
 
     ndk::ScopedAStatus res =
-            radio_ims->notifyImsTraffic(serial, 1, ImsTrafficType::REGISTRATION, false);
+            radio_ims->startImsTraffic(serial, std::string("1"),
+            ImsTrafficType::REGISTRATION, AccessNetwork::EUTRAN);
     ASSERT_OK(res);
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_ims->rspInfo.serial);
 
-    ALOGI("notifyImsTraffic, rspInfo.error = %s\n",
+    ALOGI("startImsTraffic, rspInfo.error = %s\n",
               toString(radioRsp_ims->rspInfo.error).c_str());
 
     verifyError(radioRsp_ims->rspInfo.error);
 }
 
 /*
- * Test IRadioIms.performAcbCheck() for the response returned.
+ * Test IRadioIms.stopImsTraffic() for the response returned.
  */
-TEST_P(RadioImsTest, performAcbCheck) {
+TEST_P(RadioImsTest, stopImsTraffic) {
     if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
-        ALOGI("Skipping performAcbCheck because ims is not supported in device");
+        ALOGI("Skipping stopImsTraffic because ims is not supported in device");
         return;
     } else {
-        ALOGI("Running performAcbCheck because ims is supported in device");
+        ALOGI("Running stopImsTraffic because ims is supported in device");
     }
 
     serial = GetRandomSerialNumber();
 
     ndk::ScopedAStatus res =
-            radio_ims->performAcbCheck(serial, 1, ImsTrafficType::REGISTRATION);
+            radio_ims->stopImsTraffic(serial, std::string("2"));
     ASSERT_OK(res);
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_ims->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_ims->rspInfo.serial);
 
-    ALOGI("performAcbCheck, rspInfo.error = %s\n",
+    ALOGI("stopImsTraffic, rspInfo.error = %s\n",
               toString(radioRsp_ims->rspInfo.error).c_str());
 
     verifyError(radioRsp_ims->rspInfo.error);
diff --git a/radio/aidl/vts/radio_ims_utils.h b/radio/aidl/vts/radio_ims_utils.h
index 541077f..2967476 100644
--- a/radio/aidl/vts/radio_ims_utils.h
+++ b/radio/aidl/vts/radio_ims_utils.h
@@ -36,15 +36,17 @@
     virtual ~RadioImsResponse() = default;
 
     RadioResponseInfo rspInfo;
+    std::optional<ConnectionFailureInfo> startImsTrafficResp;
 
     virtual ndk::ScopedAStatus setSrvccCallInfoResponse(const RadioResponseInfo& info) override;
 
     virtual ndk::ScopedAStatus updateImsRegistrationInfoResponse(
             const RadioResponseInfo& info) override;
 
-    virtual ndk::ScopedAStatus notifyImsTrafficResponse(const RadioResponseInfo& info) override;
+    virtual ndk::ScopedAStatus startImsTrafficResponse(const RadioResponseInfo& info,
+            const std::optional<ConnectionFailureInfo>& response) override;
 
-    virtual ndk::ScopedAStatus performAcbCheckResponse(const RadioResponseInfo& info) override;
+    virtual ndk::ScopedAStatus stopImsTrafficResponse(const RadioResponseInfo& info) override;
 
     virtual ndk::ScopedAStatus setAnbrEnabledResponse(const RadioResponseInfo& info) override;
 
@@ -60,10 +62,8 @@
     RadioImsIndication(RadioServiceTest& parent_ims);
     virtual ~RadioImsIndication() = default;
 
-    virtual ndk::ScopedAStatus onConnectionSetupFailure(RadioIndicationType type, int token,
-            const ConnectionFailureInfo& info) override;
-
-    virtual ndk::ScopedAStatus onAccessAllowed(RadioIndicationType type, int token) override;
+    virtual ndk::ScopedAStatus onConnectionSetupFailure(RadioIndicationType type,
+            const std::string& token, const ConnectionFailureInfo& info) override;
 
     virtual ndk::ScopedAStatus notifyAnbr(RadioIndicationType type, int qosSessionId,
             ImsStreamDirection direction, int bitsPerSecond) override;
