Refactored instance variable names to follow conventions.