Merge "Make name of params consistent and do a little refactoring"