Rename methods.
Fix unit tests.