Make sure we use the new class name everywhere.