tests pass, changing naming convention