fixed function names
cl -> cl-lib