Rename method.
Improve tests coverage.