Use new class-based naming scheme