Fix a broken rename/refactoring