Fix for function names and prefix in _s-cmb