Forgot to finish refactoring rename