diff --git a/lib/carin_for_blue_button_test_kit/client/v2.0.0/c4bb_client_test_suite.rb b/lib/carin_for_blue_button_test_kit/client/v2.0.0/c4bb_client_test_suite.rb
index cf2c77ab..70c3e118 100644
--- a/lib/carin_for_blue_button_test_kit/client/v2.0.0/c4bb_client_test_suite.rb
+++ b/lib/carin_for_blue_button_test_kit/client/v2.0.0/c4bb_client_test_suite.rb
@@ -112,7 +112,7 @@ def self.test_resumes?(test)
         [US Core Client CapabilityStatement](https://hl7.org/fhir/us/core/STU3.1.1/CapabilityStatement-us-core-client.html).
       )
 
-      test from: :initial_wait_test
+      test from: :c4bb_v200_initial_wait_test
     end
 
     group do
diff --git a/lib/carin_for_blue_button_test_kit/client/v2.0.0/initial_wait_test.rb b/lib/carin_for_blue_button_test_kit/client/v2.0.0/initial_wait_test.rb
index 493324ce..0e02b0f8 100644
--- a/lib/carin_for_blue_button_test_kit/client/v2.0.0/initial_wait_test.rb
+++ b/lib/carin_for_blue_button_test_kit/client/v2.0.0/initial_wait_test.rb
@@ -3,7 +3,7 @@ module CarinForBlueButtonTestKit
   class C4BBClientInitialWaitTest < Inferno::Test
     include URLs
 
-    id :initial_wait_test
+    id :c4bb_v200_initial_wait_test
     title 'Client makes claims data and required search parameter requests'
     description %(
       This test will receive claims data requests and search requests until the user confirms they are done.
diff --git a/spec/carin_for_blue_button/c4bb_client/c4bb_client_initial_wait_test_spec.rb b/spec/carin_for_blue_button/c4bb_client/c4bb_client_initial_wait_test_spec.rb
index d26d5c03..4c5fc959 100644
--- a/spec/carin_for_blue_button/c4bb_client/c4bb_client_initial_wait_test_spec.rb
+++ b/spec/carin_for_blue_button/c4bb_client/c4bb_client_initial_wait_test_spec.rb
@@ -6,7 +6,7 @@
   include RequestHelpers
 
   let(:suite) { Inferno::Repositories::TestSuites.new.find('c4bb_v200_client') }
-  let(:test) { Inferno::Repositories::Tests.new.find('initial_wait_test') }
+  let(:test) { Inferno::Repositories::Tests.new.find('c4bb_v200_initial_wait_test') }
   let(:session_data_repo) { Inferno::Repositories::SessionData.new }
   let(:results_repo) { Inferno::Repositories::Results.new }
   let(:test_session) { repo_create(:test_session, test_suite_id: 'c4bb_v200_client') }
@@ -78,10 +78,10 @@ def run(runnable, inputs = {})
     allow(test).to receive_messages(suite:, parent: suite)
 
     patient_fhir_api_request = stub_request(:get, server_patient_api_request)
-      .with(
-        headers: { 'Authorization' => "Bearer #{access_token}" }
-      )
-      .to_return(status: 200, body: c4bb_patient_search_bundle.to_json)
+                               .with(
+                                 headers: { 'Authorization' => "Bearer #{access_token}" }
+                               )
+                               .to_return(status: 200, body: c4bb_patient_search_bundle.to_json)
 
     result = run(test, access_token:)
 
@@ -106,10 +106,10 @@ def run(runnable, inputs = {})
     allow(test).to receive_messages(suite:, parent: suite)
 
     eob_fhir_include_search = stub_request(:get, server_eob_include_search)
-      .with(
-        headers: { 'Authorization' => "Bearer #{access_token}" }
-      )
-      .to_return(status: 200, body: c4bb_eob_include_bundle.to_json)
+                              .with(
+                                headers: { 'Authorization' => "Bearer #{access_token}" }
+                              )
+                              .to_return(status: 200, body: c4bb_eob_include_bundle.to_json)
 
     result = run(test, access_token:)
 
@@ -170,10 +170,10 @@ def run(runnable, inputs = {})
     allow(test).to receive_messages(suite:, parent: suite)
 
     patient_fhir_api_request = stub_request(:get, server_patient_api_request)
-      .with(
-        headers: { 'Authorization' => "Bearer #{access_token}" }
-      )
-      .to_return(status: 200, body: c4bb_patient_search_bundle.to_json)
+                               .with(
+                                 headers: { 'Authorization' => "Bearer #{access_token}" }
+                               )
+                               .to_return(status: 200, body: c4bb_patient_search_bundle.to_json)
 
     result = run(test, access_token:)
 
@@ -199,10 +199,10 @@ def run(runnable, inputs = {})
     allow(test).to receive_messages(suite:, parent: suite)
 
     patient_fhir_api_request = stub_request(:get, server_patient_api_request)
-      .with(
-        headers: { 'Authorization' => "Bearer #{access_token}" }
-      )
-      .to_return(status: 404, body: c4bb_patient_search_bundle.to_json)
+                               .with(
+                                 headers: { 'Authorization' => "Bearer #{access_token}" }
+                               )
+                               .to_return(status: 404, body: c4bb_patient_search_bundle.to_json)
 
     result = run(test, access_token:)