Refactor rename to express motion interpolator