Refactoring. renamed some properties and parameters for consistency.