[Vivian and Michael] refactored all the class names to be more accurately reflect rnr