STYLE: Rename metric and tests to start supporting non-rigid transforms