Rename to avoid confusion.
Added tests, coverage.