Refactor: rename
Add red test