fixed some naming so the tests would pass