Refactor JUnit names