Renaming and little refactoring