Refactored variable names to reflect changes in the base class