Extracting a small code refactor from Sana's other work

[emersodb]

PR Type

Other

Short Description

Small name and type changes. Incorporating an important change that Sana has made in her MkMMD work that could be separated out into a small PR.

Tests Added

None, just a refactor.