Fix tests
Use consistent naming