FIX: Revert change to class name