- Updated names showing in asserts
- Updated names to be clearer