(#12) removed CBL from class names