[TASK] Temporarily switch back to old class names in test