Before cl-ll1 class name changes