A little refactoring/renaming