sort closure, new class name fix