Revert "Revert "Revert "rename"""

Reverts reviewninja/foo#116