Is the plan rename this at the end of the refactor? I hate seeing things like `foo_new` or `foo_old` it always manages to confuse me as to why one or the other is still in the code.