Resolve ts errors with merged code, and updated name of variables

[TyrinH]

---

title: Issue # |

Discord Username: @

What type of PR is this? (select all that apply)

• [ ] 🍕 Feature
• [ ] 🐛 Bug Fix
• [x] 🚧 Breaking Change
• [x] 🧑‍💻 Code Refactor
• [ ] 📝 Documentation Update

Description

Merged in a change to recent races and it had conflicts with another PR after resolving conflicts there were new typescript errors that needed to be fixed.

Related Tickets & Documents

• Related Issue #
• Closes #

QA Instructions, Screenshots, Recordings

UI accessibility concerns?

Added/updated tests?

• [ ] 👍 yes
• [x] 🙅 no, because they aren't needed
• [ ] 🙋 no, because I need help

[optional] Are there any post deployment tasks we need to perform?

[optional] What gif best describes this PR or how it makes you feel?