Revert "Revert "rename""

Reverts reviewninja/foo#78