Improve parameter and method naming