All of these should be renamed to match the new class name