Finishing the renaming to make tests pass