Rename methods and clean up test code.