BUGFIX: Misnamed class