Rename strategy and fix tests.