FIXED: Update all class and variable names appropriately