Change in variable-names for clarification