diff --git a/modules/claims_api/app/clients/claims_api/bgs_client/definitions.rb b/modules/claims_api/app/clients/claims_api/bgs_client/definitions.rb
index 4603cce52a6..8cdd8ad5633 100644
--- a/modules/claims_api/app/clients/claims_api/bgs_client/definitions.rb
+++ b/modules/claims_api/app/clients/claims_api/bgs_client/definitions.rb
@@ -72,7 +72,7 @@ module ClaimantService
       ##
       # ContentionServiceBean
       #
-      module ContentionService
+      module ContentionServiceBean
         DEFINITION =
           Bean.new(
             path: 'ContentionService',
@@ -86,7 +86,7 @@ module ContentionService
       module ContentionService
         DEFINITION =
           Service.new(
-            bean: ContentionService::DEFINITION,
+            bean: ContentionServiceBean::DEFINITION,
             path: 'ContentionService'
           )
       end
diff --git a/modules/claims_api/app/sidekiq/claims_api/special_issue_updater.rb b/modules/claims_api/app/sidekiq/claims_api/special_issue_updater.rb
index 836b19c2603..9c7567b1833 100644
--- a/modules/claims_api/app/sidekiq/claims_api/special_issue_updater.rb
+++ b/modules/claims_api/app/sidekiq/claims_api/special_issue_updater.rb
@@ -150,9 +150,7 @@ def existing_contentions(claim, contention_id, special_issues)
     def existing_special_issues(contention, special_issues = [])
       contention[:special_issues] = [] if contention[:special_issues].blank?
 
-      # Let's just always know it is an array
-      contentions =
-        contention[:special_issues].is_a?(Hash) ? [contention[:special_issues]] : contention[:special_issues]
+      contentions = Array.wrap(contention[:special_issues])
 
       unique_special_issues = (special_issues + contentions.pluck(:spis_tc)).uniq
       unique_special_issues.map do |special_issue|