Refactored variable and parameter name