Small renaming and parameter refactoring