More refactoring / naming.