fix(renames) fix some renames after the refactor.