Changed: Adjusted some class and variable names for consistency.