More refactoring to fix names.